From patchwork Fri Nov 18 22:42:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 22780 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp466205wrr; Fri, 18 Nov 2022 15:39:25 -0800 (PST) X-Google-Smtp-Source: AA0mqf7QSR/QUNH16MgPrWTeY7C3C44j2hASODS1H8uAOSDbknND/QVH8SZ5M/sUgGM9CcVhgh4J X-Received: by 2002:a17:906:eb10:b0:78e:2ba7:70f6 with SMTP id mb16-20020a170906eb1000b0078e2ba770f6mr7959439ejb.382.1668814765567; Fri, 18 Nov 2022 15:39:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668814765; cv=none; d=google.com; s=arc-20160816; b=lywwKWtSrYMsY6y0U4BE0Je9e8GjS9jou5wUoRbUc8rolc7KjFA7XDGwnnsQ1VwGcI ZgYRd0pFkFRKOYTNDNqmhbzytarDzwvBn6ygt/QwKBkyWMmIIUJRMunKX5CFcv3BeX0K xdJ9Dy/56XeSrNADT+bwaYtZ9T2efiRTsojwSAe+8gbZAXanYy8+JhFfJ8jzGQulMNuu lcUu2t2SsgpUrO4rncENO6EpY216Z9rP4QQpDxPwOp3dMUMnRG4D2xjxasGYlHeAwggs L3iM0wZfm5h4SeNUQmsbcBpT4/i712Efn9tHWSTpOqSRnKmdxowQPOcQJcjDOMy5SHD9 8AZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=INu4lF+xxZH29w1haSHJDPf9QZLglq0kc2bAp80vbws=; b=fN7J3oNXNZdv1ZOFu+kwgYgBV/B6eVa0Ru8iUS/rGxSfKnrbcCZnnnXDgQKlF/tnX5 ZbwZKP1GFKrmGl6teSLsMOUnogWkColal+KTfSXYS/Db3FZfmJ48vDx+PnoRbA5U8Myh pim6BX4NfttCGfpIptSbW5N7Zcq6M4zsHyvXKxHpSAJfpFBmwHodpMs0LI6QvrpXs/5e MG2BUSZfe6VCv6XrrPL5FJw647bNLxqPnHVIObXKXkeULGwpO4NPRIxJ6KGIipI0xzpL ZOeSTSJKcUkWuqqsUmMMkJaGL6W86g0gsAhF7IAmhDsX0nnUAc7I4jbQO1ymWB865kXM 9sQg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a24-20020a056402169800b00461cb25bdefsi3891733edv.254.2022.11.18.15.39.01; Fri, 18 Nov 2022 15:39:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235736AbiKRXiO (ORCPT + 99 others); Fri, 18 Nov 2022 18:38:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236501AbiKRXdG (ORCPT ); Fri, 18 Nov 2022 18:33:06 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE8C9DE91 for ; Fri, 18 Nov 2022 15:21:20 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1owA9H-0004BG-MM; Fri, 18 Nov 2022 23:47:51 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1owA9F-0058hN-FC; Fri, 18 Nov 2022 23:47:50 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9E-0000LZ-Ng; Fri, 18 Nov 2022 23:47:48 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Lee Jones Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-kernel@vger.kernel.org Subject: [PATCH 444/606] mfd: max8997: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:42:58 +0100 Message-Id: <20221118224540.619276-445-uwe@kleine-koenig.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221118224540.619276-1-uwe@kleine-koenig.org> References: <20221118224540.619276-1-uwe@kleine-koenig.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749879111388400854?= X-GMAIL-MSGID: =?utf-8?q?1749879111388400854?= From: Uwe Kleine-König .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in the probe function. Signed-off-by: Uwe Kleine-König --- drivers/mfd/max8997.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c index 2141de78115d..79d551b86150 100644 --- a/drivers/mfd/max8997.c +++ b/drivers/mfd/max8997.c @@ -152,9 +152,9 @@ static inline unsigned long max8997_i2c_get_driver_data(struct i2c_client *i2c, return id->driver_data; } -static int max8997_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int max8997_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct max8997_dev *max8997; struct max8997_platform_data *pdata = dev_get_platdata(&i2c->dev); int ret = 0; @@ -478,7 +478,7 @@ static struct i2c_driver max8997_i2c_driver = { .suppress_bind_attrs = true, .of_match_table = of_match_ptr(max8997_pmic_dt_match), }, - .probe = max8997_i2c_probe, + .probe_new = max8997_i2c_probe, .id_table = max8997_i2c_id, };