From patchwork Fri Nov 18 22:36:54 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: 23151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp488999wrr; Fri, 18 Nov 2022 16:47:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Pf05m8WlRGKTGWReZdkzLxUX4F6X5Hdb1MT5O+sOb8pgaIUdGAqnJmcYo/vu3rp1NPQVt X-Received: by 2002:a17:906:6bda:b0:7ae:4a7f:3281 with SMTP id t26-20020a1709066bda00b007ae4a7f3281mr7620753ejs.50.1668818860945; Fri, 18 Nov 2022 16:47:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818860; cv=none; d=google.com; s=arc-20160816; b=dObXsE11Td8W7UGCYiBaMaUH8Z3OQxgQ2ap8Ho5Z8c5ThUpYnAWzGDuxjLjraikbq9 3xehddlEcE912f8x12XQLnzwOCm8DhCIXQgDLd4eGySby7PnW9pUoLFxEPccoD8Mzkep +hFc0VxXEnpC3x0Inc4/fj7Vkqbq0Yz2J4kAyxtxEYywPl0VQQal7ffl0ieER0Y1touH 8/a5tkPtQlHfUtcSdDadCXndIE3ZUmFrSiPy3Mc6u0E6dmmKPLrnsn/jtl6VvIWRbjMa xFJyFswhNiQP7qzsFGjDwomYB7du5/w/VBoBLS43i14I9RIyaCqyNYC8nuUmAOx753bR VyJg== 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=dIlLOCf0fplX+UOxSAgYpvLYSa0sFHBWyW4BoT0pZhw=; b=T02DrIAZ5nspH7xe3Y6ExuJKdH1Eig18i5aXZI8DEUTv7MkqbRo3cPO70NCUlm0M28 w7Vo5VCs4CMz2ksQ6vRy6I+u150vV4XJtp8HnIUwqc1fhQ0j9oi2AItZXL4/E2Z1EwBX a6ud+8rZrIITLk4mfwPff1S30EOjqeIaZslKFZEzsBCHp8gtNOQXoDilmKqIZFqJ8Qro WzORJNiizOnzwnzNoK+SkMa9HNwAIq7Ckay89KXw76izQP83zesXM8BFqLstlKgQfrRO wUzgW5YLpErHksLIvxC0wVAHiJ/GYBwI7APBangOSA4QKdGoJEmZuOK05DH6Mlrt4meJ ElVQ== 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 g7-20020a1709065d0700b007ae2dfe8b76si4294981ejt.76.2022.11.18.16.47.16; Fri, 18 Nov 2022 16:47:40 -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 S232201AbiKSAlt (ORCPT + 99 others); Fri, 18 Nov 2022 19:41:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236550AbiKSAkG (ORCPT ); Fri, 18 Nov 2022 19:40: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 760EDC76A9 for ; Fri, 18 Nov 2022 15:44:42 -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 1owA7y-0008RU-Qo; Fri, 18 Nov 2022 23:46:30 +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 1owA7u-0058EN-P4; Fri, 18 Nov 2022 23:46:27 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA7s-00Hazy-Fl; 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 , Andreas Klinger , Jonathan Cameron 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 080/606] iio: chemical: sgp40: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:36:54 +0100 Message-Id: <20221118224540.619276-81-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?1749883405682820371?= X-GMAIL-MSGID: =?utf-8?q?1749883405682820371?= 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/sgp40.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iio/chemical/sgp40.c b/drivers/iio/chemical/sgp40.c index 8a56394cea4e..c0ea01300908 100644 --- a/drivers/iio/chemical/sgp40.c +++ b/drivers/iio/chemical/sgp40.c @@ -311,9 +311,9 @@ static const struct iio_info sgp40_info = { .write_raw = sgp40_write_raw, }; -static int sgp40_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int sgp40_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 sgp40_data *data; @@ -368,7 +368,7 @@ static struct i2c_driver sgp40_driver = { .name = "sgp40", .of_match_table = sgp40_dt_ids, }, - .probe = sgp40_probe, + .probe_new = sgp40_probe, .id_table = sgp40_id, }; module_i2c_driver(sgp40_driver);