From patchwork Fri Nov 18 22:36:53 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: 23071 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp486978wrr; Fri, 18 Nov 2022 16:41:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf4klAkvWIJ5Djk7iafLL838rnatOXMqrol8bEJwFu5ukM9LFw5DNlApdkBZRa+i7anizCbC X-Received: by 2002:a17:907:a803:b0:7ae:bfeb:f484 with SMTP id vo3-20020a170907a80300b007aebfebf484mr8114626ejc.174.1668818504281; Fri, 18 Nov 2022 16:41:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818504; cv=none; d=google.com; s=arc-20160816; b=g1UZKdVc+T7YqdR1/ByKELRqcrK8OpaDv+gQy/+9rcbiGxj4x9qQFPE85ivvwQ6Vh3 V6QpxQLoATlpQbifC8wACatAiDR2en4rUkHvNk68WLNfSp716ZQ0vorttBbjj1WE12WQ J/cxOSYpU/CisjuO1hkwnqc9GrbNeQl5ROOXwpq8+p5Y+SmCKk4JhSHjxdpBpBw7zh5z kW85E27XzoKmy1zDegsNow3rCupnz0dOALpmnVPcyFUReCDWp1+ZdU3pWnN95/Xymfml 93yUlnB1wNeCICe8RTwqx2BP7wlk9NG3MIPaJKoiDvvn7g4XX/Y+sjkGt7P21rD/LLmP 7zHg== 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=cDbxt78FncIZOIXXjCwo3x6iFRG/wWMEH18tNxRRRUI=; b=QUGMYwgG8WaVo1V+V5kSZeeyC7b7zU7wDqpd5xeB20/C2dId9L1LeW6IwPBzSglNYz C1nIE0BMFw0HjINJA2WYtSh6GbVL2m8ThwCA5G5AKO+cN2EbwtW04+3joKfts/+1G7CR QbnsHf3fJnM32Wk6bnlCv8BilIe+h+N0ZU1HFtFWXNfLnoJzBN9Ifvcay2G1O5NeKsER Ucu44K42whZgqYlT2L2jGv2EaXSHyp2LQ2G3rMkG5y9WcutuhyWGflNnmn3G9Fc0Ut6Y mYdrjFq5JdRUHQSOsV045NdT7gO+5WupuVj38SPLJv8+XErUb/TIXriirQVJ1UbnqQ5P ovKQ== 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 m10-20020a056402430a00b0045c98bb5359si4920820edc.590.2022.11.18.16.41.18; Fri, 18 Nov 2022 16:41:44 -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 S232755AbiKSAgr (ORCPT + 99 others); Fri, 18 Nov 2022 19:36:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232306AbiKSAfx (ORCPT ); Fri, 18 Nov 2022 19:35:53 -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 304708C4BC for ; Fri, 18 Nov 2022 15:43: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 1owA7x-0008JN-Hm; Fri, 18 Nov 2022 23:46:29 +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 1owA7s-0058Dc-Ts; Fri, 18 Nov 2022 23:46:25 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA7s-00Hazv-8S; Fri, 18 Nov 2022 23:46:24 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Jonathan Cameron , Corey Minyard , Adrien Grassein , Miguel Ojeda , Hans Verkuil Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , Lars-Peter Clausen , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 079/606] iio: chemical: sgp30: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:36:53 +0100 Message-Id: <20221118224540.619276-80-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?1749883032387645216?= X-GMAIL-MSGID: =?utf-8?q?1749883032387645216?= 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/chemical/sgp30.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iio/chemical/sgp30.c b/drivers/iio/chemical/sgp30.c index e2c13c78c7e0..9d0c68485b63 100644 --- a/drivers/iio/chemical/sgp30.c +++ b/drivers/iio/chemical/sgp30.c @@ -496,9 +496,9 @@ static const struct of_device_id sgp_dt_ids[] = { { } }; -static int sgp_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int sgp_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct device *dev = &client->dev; struct iio_dev *indio_dev; struct sgp_data *data; @@ -575,7 +575,7 @@ static struct i2c_driver sgp_driver = { .name = "sgp30", .of_match_table = sgp_dt_ids, }, - .probe = sgp_probe, + .probe_new = sgp_probe, .remove = sgp_remove, .id_table = sgp_id, };