From patchwork Fri Nov 18 22:42:39 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: 22809 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp467842wrr; Fri, 18 Nov 2022 15:44:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf7EgtHuEoFyCnPPKmLwAR6w7XVxXtPbljsALAUwLtSydVAxeI2WyZ73YyQYBSksEQz6OyaR X-Received: by 2002:a05:6402:48e:b0:463:ab06:f338 with SMTP id k14-20020a056402048e00b00463ab06f338mr7998670edv.371.1668815094953; Fri, 18 Nov 2022 15:44:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668815094; cv=none; d=google.com; s=arc-20160816; b=Rd/v1HajGVptENX6nDAZXqCRYDcewxqa2CN5q5EbS3jp2Q82UMmzzyfuYumm8v6adp Ks7h2mJUrjbHa7CIoskmhshZrj+bu6F+G9hSW7LfpbsvxAMBLdSLYkO10IL794wqAkf5 CxazIRieOHNquO7CFTugLX0GtsmTYR/wuX+zLQlHHXglB/EpPwv8aMAUzMF+HMjqk7B3 i1uq0PGN7w1z08EllWLruqThFVs3zsvKphmrF3sgCPchRGYk8gSnj3kJoVeQLFB0rGwj NMQ+YszRH0vHDy2VOz4sEjrl9yRWvHtw4jRvdSNl2m3mTpKWsvrGixSYx1uHm4zSSuPr UhVA== 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=yKHEkxWps5SG41jcU+1j+BkOPIe2wcXb2rwfH4fWB1o=; b=dbs5xCLiUWlX8G8xwabPclAbokN8vTTHzzWTVg8POucH5UW5y44WsZ0YYoQTE4yRUK 9+qhmHjn38+yps7a+Dbk82fLcvP631yU7ht7QMXrJQk8YsrKpnPi/G1ufxLu+iYfb0IX bYWLX3Q2cY8MxrY8M32YdTxd1qoRtO2V3qvZeWej7+Q5IaiT6HsifFspV/iz8vHwTJkB v7EaFpzpLgBGP7DL/JKI+6V5HFsg1OarIZN/siHCVQaMGWqTbH1Y6r9CRBTE3MKBn1iQ ns+cTDZapIOB8mmAC3sOZo8i7qZRGXJR+j5MAxxYp0/8DzdIU4ZMBkJ+yuu/kbDyj1pC U1VQ== 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 xc1-20020a170907074100b0078da99ecbdbsi1025796ejb.673.2022.11.18.15.44.29; Fri, 18 Nov 2022 15:44:54 -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 S236770AbiKRXlC (ORCPT + 99 others); Fri, 18 Nov 2022 18:41:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236901AbiKRXiH (ORCPT ); Fri, 18 Nov 2022 18:38:07 -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 06C62C560C for ; Fri, 18 Nov 2022 15:22:54 -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 1owA9D-0003z5-Sf; Fri, 18 Nov 2022 23:47:47 +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 1owA9B-0058ff-7f; Fri, 18 Nov 2022 23:47:46 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9A-0000KS-Ut; Fri, 18 Nov 2022 23:47:44 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Support Opensource , 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 425/606] mfd: da903x: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:42:39 +0100 Message-Id: <20221118224540.619276-426-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?1749879457361089009?= X-GMAIL-MSGID: =?utf-8?q?1749879457361089009?= 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/da903x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c index 3f8f6ad3a98c..44a25d642ce9 100644 --- a/drivers/mfd/da903x.c +++ b/drivers/mfd/da903x.c @@ -488,9 +488,9 @@ static int da903x_add_subdevs(struct da903x_chip *chip, return ret; } -static int da903x_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int da903x_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct da903x_platform_data *pdata = dev_get_platdata(&client->dev); struct da903x_chip *chip; unsigned int tmp; @@ -543,7 +543,7 @@ static struct i2c_driver da903x_driver = { .driver = { .name = "da903x", }, - .probe = da903x_probe, + .probe_new = da903x_probe, .remove = da903x_remove, .id_table = da903x_id_table, };