From patchwork Fri Nov 18 22:44:01 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: 22911 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp472917wrr; Fri, 18 Nov 2022 16:01:09 -0800 (PST) X-Google-Smtp-Source: AA0mqf49e3us9qMl5ogkwn9maDakujd7Q3PKU3Gb5zpC3DGVtZQIC77q6dHn45fAJVXQ7T8SrOHX X-Received: by 2002:a62:bd18:0:b0:562:3aed:e40c with SMTP id a24-20020a62bd18000000b005623aede40cmr10303337pff.2.1668816068785; Fri, 18 Nov 2022 16:01:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668816068; cv=none; d=google.com; s=arc-20160816; b=teC3IOM0XQI5GUSEunkgFkn6m+i0XSdhmNIwcCPmaQ5y9J59VXtTfI2fzYIFThd8ul C+z0d+2WVnwVKPvvM5MmoNlmcUZ/cNRYGAVqQXPqGmUWBMpWRncUB0G4Irkn4jLyRuYD FOMjB1r9Eo1ebzrV87AO+oWVrRht6Rhe080xp2es7YEG5ezvzlFB+S0UZRFiVkB7A5GQ JoNkEmA3usU6sWIVoVnScsImEBjqLt7U1b73ALDFrOESDYt1iDmfPn+Xn1hRzlM+HQ4J TnmuG0O0+xKDISDd4fcKM79LP0n6hxoJLd2Mp3LSu2C2i8i6VKyGnWARJLTSVEdGqFbK /ncQ== 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=SA8Dw8vgTDfrUr9QH907Y1Y2JZNWlmbRQhByJCR7q+I=; b=v2xE+rsVse56B6qGm4mOqrEW0nj2KfJ8kv/iM4SgLWvZStkRCaioyBmmq1jNt9yl3x bJ9KnauDerAST1WjjkcwZN53Xbu1r8zeKqR8DwWrrcsEoaRoAtdJ8u1c67rKpXJtEFIo XAON3fN0mLZBFaOtDfb7XBJQcziPPOAEQnLVIdw84dykxk61KgjyCJ3nRDzDWOGzBd43 e+Syx41Z12Ph1ykJz+N0GXIDi7eE3gfG4flwiPZ4FfqfJbgADNzYUPlmzTO8tt+iKgss QyXHf3CvUhK+JPxIAySbWG+mvqRtjcrqfWh9SS1j8B+ojj+bnEZ48Op/9C87zf25bXHK Z9tA== 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 lr11-20020a17090b4b8b00b002009d750a2dsi9332007pjb.58.2022.11.18.16.00.55; Fri, 18 Nov 2022 16:01:08 -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 S233604AbiKRX4H (ORCPT + 99 others); Fri, 18 Nov 2022 18:56:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235284AbiKRXyv (ORCPT ); Fri, 18 Nov 2022 18:54:51 -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 D6F29CB694 for ; Fri, 18 Nov 2022 15:27:58 -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 1owA9U-0004j1-0i; Fri, 18 Nov 2022 23:48:04 +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 1owA9R-0058mX-Dd; Fri, 18 Nov 2022 23:48:02 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9R-0000Pl-55; Fri, 18 Nov 2022 23:48:01 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Krzysztof Kozlowski , Andy Shevchenko , Hans Verkuil , Adrien Grassein , Luca Ceresoli Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 507/606] nfc: st-nci: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:44:01 +0100 Message-Id: <20221118224540.619276-508-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?1749880478094837086?= X-GMAIL-MSGID: =?utf-8?q?1749880478094837086?= From: Uwe Kleine-König The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/nfc/st-nci/i2c.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c index 89fa24d71bef..6b5eed8a1fbe 100644 --- a/drivers/nfc/st-nci/i2c.c +++ b/drivers/nfc/st-nci/i2c.c @@ -195,8 +195,7 @@ static const struct acpi_gpio_mapping acpi_st_nci_gpios[] = { {}, }; -static int st_nci_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int st_nci_i2c_probe(struct i2c_client *client) { struct device *dev = &client->dev; struct st_nci_i2c_phy *phy; @@ -284,7 +283,7 @@ static struct i2c_driver st_nci_i2c_driver = { .of_match_table = of_match_ptr(of_st_nci_i2c_match), .acpi_match_table = ACPI_PTR(st_nci_i2c_acpi_match), }, - .probe = st_nci_i2c_probe, + .probe_new = st_nci_i2c_probe, .id_table = st_nci_i2c_id_table, .remove = st_nci_i2c_remove, };