From patchwork Fri Nov 18 22:44:58 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: 23074 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp487018wrr; Fri, 18 Nov 2022 16:41:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf4H3BRiOSew+WG1Zmnz3I6iHLAugIFYvae1GM1Fq0nLLAVj2LHlZkVSQ9YOXvaUA3KtZoTT X-Received: by 2002:a05:6402:50a:b0:469:4cda:5466 with SMTP id m10-20020a056402050a00b004694cda5466mr1397edv.301.1668818510309; Fri, 18 Nov 2022 16:41:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818510; cv=none; d=google.com; s=arc-20160816; b=n6E1taXHHnniKWpSdZNtUhwfLLVy/kb+hR1JztxaHtE4WrQLURsZN24+52f9jihmdO 7g86Y1Hh8uLfPRFUC/HqXTrQPkmtMBGvUqy/pqHJqA3pr9UeOE6ptocJbTRv8uGXk+Tt NtySNPox38LTLEd5E8uexqqLvHuD2asCahYB1Og1u7UOpfFgOX66XMXRTRYCFcJmRwJ6 wKWx9qb2KZYBIqPlKEwREw1X6V9vgp0mf2suiwsuNEwEFkJxf5Dha3l+rfAM7EWiIRLM YI5+FuWBBK/Le++7IbnW0WNeGYQkra9wI4EMUJVJay6UnwErXs2bnYZc8zlGVpx1gKGE f/xQ== 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=eEIuErLoUGUSJ2pW4t58YRInWZ61mXptQ2Eqs8C/UhA=; b=lJAdenxY17VFPOuEPTazHu6BvutxarRbSfXy20/3Nzg6mv8pHpkORGjuRSg5cPGGRi wkVA2mWrYsq9BhODx8Da+RMFCOReZeCE0DiPoCuikBGo1jq4NIpW5OCPnF4ANqxfpC3A TkiNEtgP12vf5QLOKl9YwEmNRKbWH0zQVZ/iCBRN9jlkiKs8EpJ/wwUMjs1IYmYEO7S/ ewWaTXQ/H6xSeGRYvNZERYmhe3W04hKALqdk7zfAoXQ3bkU3a7T2skwmxCcuQ+XO/ZNw YNnQpvRBHuh/i2XPTs90pqwu41M/HmMt74194OEe18gGfvPNtIbHtf7sDuxCWdANdFn6 4/LA== 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 r9-20020a1709063d6900b007ad7e81a30csi3057613ejf.167.2022.11.18.16.41.23; Fri, 18 Nov 2022 16:41:50 -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 S230131AbiKSAhU (ORCPT + 99 others); Fri, 18 Nov 2022 19:37:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234813AbiKSAgD (ORCPT ); Fri, 18 Nov 2022 19:36:03 -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 6EA7A116AAD for ; Fri, 18 Nov 2022 15:43:22 -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-0005C6-BQ; 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-0058qy-G3; 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 1owA9c-0000TS-NA; Fri, 18 Nov 2022 23:48:12 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Mark Brown Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 564/606] spi: sc18is602: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:44:58 +0100 Message-Id: <20221118224540.619276-565-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?1749883038253718183?= X-GMAIL-MSGID: =?utf-8?q?1749883038253718183?= 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/spi/spi-sc18is602.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-sc18is602.c b/drivers/spi/spi-sc18is602.c index 5d27ee482237..983b3621bc2a 100644 --- a/drivers/spi/spi-sc18is602.c +++ b/drivers/spi/spi-sc18is602.c @@ -235,9 +235,9 @@ static int sc18is602_setup(struct spi_device *spi) return 0; } -static int sc18is602_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int sc18is602_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct device *dev = &client->dev; struct device_node *np = dev->of_node; struct sc18is602_platform_data *pdata = dev_get_platdata(dev); @@ -337,7 +337,7 @@ static struct i2c_driver sc18is602_driver = { .name = "sc18is602", .of_match_table = of_match_ptr(sc18is602_of_match), }, - .probe = sc18is602_probe, + .probe_new = sc18is602_probe, .id_table = sc18is602_id, };