From patchwork Fri Nov 18 22:44:02 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: 22866 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp472089wrr; Fri, 18 Nov 2022 15:59:20 -0800 (PST) X-Google-Smtp-Source: AA0mqf75DwfrFKwqZqv30/yOj7a8XcsGZeIAPVG5sM7tEv8x3xcMIG+ygYfYSNQNFd8/999GX33n X-Received: by 2002:a17:907:170a:b0:7ad:a198:3177 with SMTP id le10-20020a170907170a00b007ada1983177mr7966752ejc.750.1668815960592; Fri, 18 Nov 2022 15:59:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668815960; cv=none; d=google.com; s=arc-20160816; b=OFNlSFI28EYZdfWmJ7cpPJLm3I4C+Dxh2d8W2T0pwrVrYdsvevs1vHlNpn0ypNEfsY ZqdjH5M25bzyGyfpJydqwKun283Zuhx1qL+d1SazQwiokhfbY7EJPktx51kk00vm4RUo JdU38YFmztFBvWKawQZCR/Cs1+TopYdJwxp2YajWw2BSVcT6OSN98ZbThxSht/ld32GK kuaATMiMyVjzOwP7wOaQZmdTfeqNN7nX8SGvQVPY087rvIFo7TvLHlbg0qY1Mkqy3y/a EEkBzfU/66/Dj1poCtCl2DJalEXtqsiaxhdZUMn1xLQdCzA+wlhpJBiECamE+5FVrvoy UO0w== 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=zwNQLyzaIapxdCgz0yvI3Jtq9Zr8wLqKSGY6sRnL028=; b=uHNraxoX6qC0ISbN0PBqSFUtCAUJUdhTm4vsM2z0V2NzOQmwyUhn5LzDczex9yR676 Ll9V4Pk32kZ0xVvXT1TIB2+4ce6X3FKa24BQgf46HOvN45iXGvceVnFcaW1Bwj5g4ScC MKaE7VkgIszuRPiWYh1XG0SCvUbP34swcs4unG+RDCzfPjgW7rPGuHQD/z4TzN06q254 Ug6qfip7g+1lXQgnqdpOlGq8Lwe+usYdt83lobR8XTDDHtuhaV2OpGF/udp0rzmixEfG oRMrcRt7aEB2THYABevQCncI3iGQcMMTrAIg5kH1pNE37iPbtTX5osBK7HwEsRRu20Tt mjww== 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 e17-20020a056402191100b0046013b7e7efsi4584339edz.631.2022.11.18.15.58.55; Fri, 18 Nov 2022 15:59:20 -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 S236551AbiKRXnM (ORCPT + 99 others); Fri, 18 Nov 2022 18:43:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236837AbiKRXl4 (ORCPT ); Fri, 18 Nov 2022 18:41:56 -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 E3D3BC6BE5 for ; Fri, 18 Nov 2022 15:23: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 1owA9U-0004jf-6u; 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-0058me-Jl; 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-0000Po-BZ; 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 , Jakub Kicinski , Srinivas Pandruvada , Yang Yingliang , Colin Ian King , Wei Yongjun 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 508/606] nfc: st21nfca: i2c: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:44:02 +0100 Message-Id: <20221118224540.619276-509-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?1749880365115298848?= X-GMAIL-MSGID: =?utf-8?q?1749880365115298848?= 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/st21nfca/i2c.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index 76b55986bcf8..55f7a2391bb1 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c @@ -487,8 +487,7 @@ static const struct acpi_gpio_mapping acpi_st21nfca_gpios[] = { {}, }; -static int st21nfca_hci_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int st21nfca_hci_i2c_probe(struct i2c_client *client) { struct device *dev = &client->dev; struct st21nfca_i2c_phy *phy; @@ -598,7 +597,7 @@ static struct i2c_driver st21nfca_hci_i2c_driver = { .of_match_table = of_match_ptr(of_st21nfca_i2c_match), .acpi_match_table = ACPI_PTR(st21nfca_hci_i2c_acpi_match), }, - .probe = st21nfca_hci_i2c_probe, + .probe_new = st21nfca_hci_i2c_probe, .id_table = st21nfca_hci_i2c_id_table, .remove = st21nfca_hci_i2c_remove, };