From patchwork Fri Nov 18 22:45:00 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: 22660 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp460899wrr; Fri, 18 Nov 2022 15:25:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf4cS/fZiF4eO0ij2PnppARabSs4fVLKV7QeeNbbARtMQpgeo1rcJNMgkjc0U2PSNp4+9ltF X-Received: by 2002:a17:906:22d0:b0:7b2:a7aa:173d with SMTP id q16-20020a17090622d000b007b2a7aa173dmr5746256eja.140.1668813941063; Fri, 18 Nov 2022 15:25:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668813941; cv=none; d=google.com; s=arc-20160816; b=XZaobMJ8gPmcDhxbzvELIzvezknPhSSmJcFX/q+GhVPglA7UNgWI1hQzAe+rj89ZQi zBx0yNmaO9WATzoH4trFopor91bobLjUPutfrCu8jtD4XAHzuVHbkVBMg8qTaQ+Hm+HW WmLXTQrZikCpaG2Z6Hmid/Ek0yEsvXhSb+FRl1szQPK4Xwk46J1mpLwG4+a5h0K8J8G7 mkBBZSPZx4GbmMHdEMFiteaWoXGwvokAYR1ZNu6q5AXfNe4gvYjns1VxaqJYVR2kopj8 PY+I0x1WYHjjJuR3fZSLjM1BgD6P0MCvXcxVU5rlH0Q+ylm4aSMl0+g8ychmtTwChOpO hDYw== 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=N/jizgGcAvcf/SaYReb7ypONzrIThn0Qi0cYrYfZxIE=; b=SdotEmFX3ljMfhZtkbPpgFb08XPazFt5qpsL1KaLcE6HQ2XlJ/CGKqXpQ96DqVmUpK OOs3jOtqmahUOwDBNzgnkyoX53v2KVKYB6huAzqlqB0GHlVvE7zH1qXRP83ybgdMwcMw 6zGHvYU6Vf4CpxSgBrxwxWy8L4NIkBudH21SreaQ4pJEBMJg2fATCj00w8hAqD0v3dtC q4IWnWTlhyDaARKOsXuHrJpXWrT/p4tQ00PPuBEkGcpaA47HoND84GIVGoda370NGlRy b29fjAMu78VaZDwYNC7RwojIEYk3x4qXVJcLvLPi1ipbrbZDwOdvBz7rbMkteMoahagx BXkg== 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 dd22-20020a1709069b9600b007ae50c64522si4441675ejc.520.2022.11.18.15.25.17; Fri, 18 Nov 2022 15:25:41 -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 S230271AbiKRXYX (ORCPT + 99 others); Fri, 18 Nov 2022 18:24:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235567AbiKRXWJ (ORCPT ); Fri, 18 Nov 2022 18:22:09 -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 56FEA97EC4 for ; Fri, 18 Nov 2022 15:13:07 -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 1owA9f-0005Ck-P7; Fri, 18 Nov 2022 23:48:15 +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 1owA9c-0058r6-QT; Fri, 18 Nov 2022 23:48:13 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9d-0000Te-1g; Fri, 18 Nov 2022 23:48:13 +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 , Greg Kroah-Hartman 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-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 566/606] staging: iio: adt7316: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:45:00 +0100 Message-Id: <20221118224540.619276-567-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?1749878246909553918?= X-GMAIL-MSGID: =?utf-8?q?1749878246909553918?= 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/staging/iio/addac/adt7316-i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/iio/addac/adt7316-i2c.c b/drivers/staging/iio/addac/adt7316-i2c.c index 5543cc909707..7e3d1a6f30ba 100644 --- a/drivers/staging/iio/addac/adt7316-i2c.c +++ b/drivers/staging/iio/addac/adt7316-i2c.c @@ -93,9 +93,9 @@ static int adt7316_i2c_multi_write(void *client, u8 reg, u8 count, u8 *data) * device probe and remove */ -static int adt7316_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int adt7316_i2c_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct adt7316_bus bus = { .client = client, .irq = client->irq, @@ -138,7 +138,7 @@ static struct i2c_driver adt7316_driver = { .of_match_table = adt7316_of_match, .pm = ADT7316_PM_OPS, }, - .probe = adt7316_i2c_probe, + .probe_new = adt7316_i2c_probe, .id_table = adt7316_i2c_id, }; module_i2c_driver(adt7316_driver);