Received: by 2002:a05:622a:1442:b0:3a5:28ea:c4b9 with SMTP id v2csp450857qtx; Fri, 18 Nov 2022 17:00:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Ovc/ieWaerW+uStZ4YAG0HG9mpCNjcxciQzQ1imPDBbaPryEejHP+gI1IR1aF0RURE+TP X-Received: by 2002:a63:e54b:0:b0:46f:8e45:8da1 with SMTP id z11-20020a63e54b000000b0046f8e458da1mr8908358pgj.71.1668819616805; Fri, 18 Nov 2022 17:00:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668819616; cv=none; d=google.com; s=arc-20160816; b=oyAMwpFdw9/oV0bv0x/TskwEHGJkmo/giCob3lNBf3s+39xE6+YqxwgjZXmta+PvL3 5NZQyTyPK3FDO/6BytSnKE+wEJDL8g8FivrQt0MrXsclFFaiUzJi0M5lhFhKY7wG+aQL SIpWF6AnjpIOcDu7ANjBUoQr8Oa0wobSzLNL5AK05cK3uDQOtmfDGkweUVzzWisUHNzO 7IQ5pWeY54oHBix81F6iAbOmk1oX9e5L8p+6bPWjTA0jZimw2pMIa0h7RDkXxGlotzva 2QAPwi7KJTFFfiQuhBIF7pNfBeTIEnHu/+KK6byzEGyz9QX+J03stnd7l9WvSo7nEYqj qOyw== 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=vwNkzmhHlTnuDoZr3ebZQdKcEPtv56mHUj9uxXaDkUg=; b=UkgTO+Q2Gg0rnB4uGAsqq9D7NQhSX0AMMPqIHyhNsYaHUtTnSk7PoF/egeaPLd9cJn 2rIo2bBqqUQVSBgyGZrSyilB7KA3bhvtT5FIshgdrvnFe3b3nMTkf9kokyvs6LYl+p9D 3iDMc7S+mqODSzndPAToNg2KP8SyBbBzWAbf6t3ujjV3MidfeZcxiTafwHjN4zsxIuRX rnj6dYvrZApQVpwp69sv+LcoXF0HIqGosQwk1cBVEI37Yu5ssu6WfB2DEImxx5o66zp+ LsyoYINdraTxXbSq2yhOKJ2sB5N9MlXJgRUg4h6ofZrosQVf+dYBhxAMqmPm5331jca3 OQBA== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l2-20020a170903244200b0018862b7f8bbsi5541667pls.198.2022.11.18.17.00.03; Fri, 18 Nov 2022 17:00: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 S237560AbiKSAKD (ORCPT + 90 others); Fri, 18 Nov 2022 19:10:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232098AbiKSAJg (ORCPT ); Fri, 18 Nov 2022 19:09:36 -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 4860E9E976 for ; Fri, 18 Nov 2022 15:32:53 -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 1owA9S-0004f9-M5; Fri, 18 Nov 2022 23:48:02 +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-0058m3-2P; 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-0000PR-4Z; Fri, 18 Nov 2022 23:48:00 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Krzysztof Kozlowski , Adrien Grassein , Petr Machata , Luca Ceresoli , Jean Delvare , Shang XiaoJing Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 502/606] nfc: mrvl: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:43:56 +0100 Message-Id: <20221118224540.619276-503-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 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/nfcmrvl/i2c.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c index 24436c9e54c9..c3ab49df1e35 100644 --- a/drivers/nfc/nfcmrvl/i2c.c +++ b/drivers/nfc/nfcmrvl/i2c.c @@ -181,8 +181,7 @@ static int nfcmrvl_i2c_parse_dt(struct device_node *node, return 0; } -static int nfcmrvl_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int nfcmrvl_i2c_probe(struct i2c_client *client) { const struct nfcmrvl_platform_data *pdata; struct nfcmrvl_i2c_drv_data *drv_data; @@ -257,7 +256,7 @@ static const struct i2c_device_id nfcmrvl_i2c_id_table[] = { MODULE_DEVICE_TABLE(i2c, nfcmrvl_i2c_id_table); static struct i2c_driver nfcmrvl_i2c_driver = { - .probe = nfcmrvl_i2c_probe, + .probe_new = nfcmrvl_i2c_probe, .id_table = nfcmrvl_i2c_id_table, .remove = nfcmrvl_i2c_remove, .driver = { -- 2.38.1