From patchwork Fri Nov 18 22:43:57 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: 22997 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp477323wrr; Fri, 18 Nov 2022 16:11:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ZLi1b03yOmTbeV8olIrBp0wa50fJRWUdZnwE1JfIOsc+YBJN1Rfa+h4cOzpE2TpucePuJ X-Received: by 2002:a17:902:b691:b0:188:5240:50ec with SMTP id c17-20020a170902b69100b00188524050ecmr1680932pls.168.1668816676963; Fri, 18 Nov 2022 16:11:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668816676; cv=none; d=google.com; s=arc-20160816; b=d7kghnx6SVaxLIsbb8Ra/igtdOWppMAz61hBrxykhothJfBTgMxreIH1AX9iEcjEbo 8nf7rZtKvZjLORrXLVoIOFHCJ9vTjm1BCJOJwfl1WpFMXFoXcwAbQidZGQ26w5WWZ6SF DR3zGilMfx2J7OgfkZR3Yo0QBJO+N46mdjD+r/lcWeBd/6pGHABgkbwyOsnBUrTn9BG2 b0q1RBSDFC3Enx59VMPG5Rs1Bx621M3yO5NSa0jOB+GwH6pe7WcWe0Hp5t1A6n4Yidqt HSTnWQtQg62/e8qTbbPkXio9GS7PvWH7l35giOid4BrI1/VUVK8gmMKb67KxlrovIgCx zcng== 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=Zprq7DJP+kH55uSH5Or7gokGhb7rqueBHZk/ltjexhY=; b=fg1ahs7rqfGeeTN6CGlufJnA8hPpbGVj/9+EH8hOlOVQUxIVCL0YfLN33SJbQO64Ad fNmgJlmdUpg5ZwXRG7BKhvtgLazlDzn9PEe6Kby6etJgeU6q71IILxrjtVKUUcybrQnH sUvSS5EaEDaysBMGeV+bTv5l9AFLbe+Ooy/9BwdBaI433nMTHCA8lxwtCuEeYkxJYkxq pj0XL5CERxjXfnMUc6NHFdRX5eoVLZu/3sCrUI9icNmsJUBTgMfEAi+K+itd1QrNtu2+ uXCtuRNp2nkPthUcHvtVJl0Bufuaoyfgk0V0Vd+TffNPmCGk826dt+NtxGAWgKctj63A RQ9g== 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 m2-20020a655642000000b004701dd79b18si5196243pgs.432.2022.11.18.16.11.04; Fri, 18 Nov 2022 16:11:16 -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 S237628AbiKSAKa (ORCPT + 99 others); Fri, 18 Nov 2022 19:10:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237494AbiKSAJu (ORCPT ); Fri, 18 Nov 2022 19:09:50 -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 09FFB1EED7 for ; Fri, 18 Nov 2022 15:33:08 -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 1owA9T-0004h6-BL; Fri, 18 Nov 2022 23:48:03 +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 1owA9Q-0058mE-OB; Fri, 18 Nov 2022 23:48:01 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9Q-0000PW-CP; Fri, 18 Nov 2022 23:48:00 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Krzysztof Kozlowski , Michael Walle , "David S. Miller" , Heikki Krogerus 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 503/606] NFC: nxp-nci: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:43:57 +0100 Message-Id: <20221118224540.619276-504-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?1749881116139626303?= X-GMAIL-MSGID: =?utf-8?q?1749881116139626303?= 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/nxp-nci/i2c.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c index ec6446511984..d4c299be7949 100644 --- a/drivers/nfc/nxp-nci/i2c.c +++ b/drivers/nfc/nxp-nci/i2c.c @@ -263,8 +263,7 @@ static const struct acpi_gpio_mapping acpi_nxp_nci_gpios[] = { { } }; -static int nxp_nci_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int nxp_nci_i2c_probe(struct i2c_client *client) { struct device *dev = &client->dev; struct nxp_nci_i2c_phy *phy; @@ -349,7 +348,7 @@ static struct i2c_driver nxp_nci_i2c_driver = { .acpi_match_table = ACPI_PTR(acpi_id), .of_match_table = of_nxp_nci_i2c_match, }, - .probe = nxp_nci_i2c_probe, + .probe_new = nxp_nci_i2c_probe, .id_table = nxp_nci_i2c_id_table, .remove = nxp_nci_i2c_remove, };