From patchwork Fri Nov 18 22:36:35 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: 22583 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp448008wrr; Fri, 18 Nov 2022 14:51:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf62k6J/N2PIN0QxqzuK7T9K881wVZAjgUWf8lyxyGCTbU4qel40R3nTZ5Mtp4bWMF/klGHJ X-Received: by 2002:a05:6a00:22ca:b0:56e:64c8:f222 with SMTP id f10-20020a056a0022ca00b0056e64c8f222mr9872859pfj.71.1668811862318; Fri, 18 Nov 2022 14:51:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668811862; cv=none; d=google.com; s=arc-20160816; b=fchA63l7UpWgpXrv+7Lqsa2En+hJ5YyNOKPGvz2ziw9Bw+fPNCOoZco5TxFDI+2/j5 XE+FiTcOYsGQVVn2KJaP0h9Gmlce7/bQRrF55GvcxkTxSNyELRXPiMmCl32fE7KckNa2 2BtEk08egjcLwW3r0JVIPEMOhyEaSAa68NEtrLFDVHrK0yLflxRSBVk9iY0+LqOY5YAm S7oUwx+vA7l3PwrS4epLJJFxRIxPyXeHgvSZzkTdlVE/S58sN75wTrNJD1VxgDSH6SWt NnfB615Nfmr9ZMuKKgE6SDsIjXvvZGwwIKXo6ZdC+yOhtQUc8sr/m3kc9Ig2rAENnVFV stVA== 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=CYnSXhyE5GAYyB7ICppebjl8oncIMm11EbqIg0bZCLU=; b=RjwlVXBJtPySpQcWt6Zug+0PdIknLo/cui+k4jjaJ77LtUYHUKshT4YSlAwg49Wx5d R4u5BwaZZJVlwJRvUTAAm9HgRn5G/ZCu0ZJDWRe+BHHiEbWRg9178hrkobkykuvNj2Ay XvVKdwoZ1q8WX4m45ytUMQEfoVDEGrS64vHmJltkIaWAO4rMyNVg2pX5O96OjZUPyVuU 9nuFg9lPPcPfoqgcLir/pxxVm9WWcbJguLXlt0xQe3BGibP7WvJRfBdxF/03fNnVD6mH S6n+z94axlJeGI9wmR63Mn5mktnki0Ljgkr4Ob5YmZpoWSM/vViyBjvq5tXNR7kF3jTB kbPw== 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 e2-20020aa78242000000b005633766252asi4449506pfn.313.2022.11.18.14.50.50; Fri, 18 Nov 2022 14:51:02 -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 S233765AbiKRWuI (ORCPT + 99 others); Fri, 18 Nov 2022 17:50:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231660AbiKRWrA (ORCPT ); Fri, 18 Nov 2022 17:47:00 -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 5E693B8FA2 for ; Fri, 18 Nov 2022 14:46:43 -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 1owA7r-0007vC-Ma; Fri, 18 Nov 2022 23:46:23 +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 1owA7o-0058C2-8K; Fri, 18 Nov 2022 23:46:21 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA7o-00Haym-9w; Fri, 18 Nov 2022 23:46:20 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Lars-Peter Clausen , Michael Hennerich , Jonathan Cameron Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 061/606] iio: adc: ad799x: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:36:35 +0100 Message-Id: <20221118224540.619276-62-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?1749876067468287067?= X-GMAIL-MSGID: =?utf-8?q?1749876067468287067?= 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/iio/adc/ad799x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c index 4730d8d0f4c3..8f0a3a35e727 100644 --- a/drivers/iio/adc/ad799x.c +++ b/drivers/iio/adc/ad799x.c @@ -775,9 +775,9 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { }, }; -static int ad799x_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ad799x_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); int ret; int extra_config = 0; struct ad799x_state *st; @@ -968,7 +968,7 @@ static struct i2c_driver ad799x_driver = { .name = "ad799x", .pm = pm_sleep_ptr(&ad799x_pm_ops), }, - .probe = ad799x_probe, + .probe_new = ad799x_probe, .remove = ad799x_remove, .id_table = ad799x_id, };