From patchwork Fri Nov 18 22:44:00 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: 22783 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp466364wrr; Fri, 18 Nov 2022 15:39:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf5DV6P4sJqWqGrDUpWUc7och2AEhSNkoNLXtBZB/pexDnfkQmKKtF4j0c2y9WLOcmtmQI5z X-Received: by 2002:a17:906:bce9:b0:7ad:960d:3a4d with SMTP id op9-20020a170906bce900b007ad960d3a4dmr7437456ejb.522.1668814788992; Fri, 18 Nov 2022 15:39:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668814788; cv=none; d=google.com; s=arc-20160816; b=lYSFzZ7J4Bq6LWfQ0Sl6M7l6fbrBrovzi7Jeo3oSfa7zijoh/DulrEJS2Xz/CfXgLD ujtkLdcvfehu+doeJ76Ur9rLllYfBoqwELebm18pwbYDtMBtqjJtKZvlqNaH89fvomDh Xwdot7oV8bl4g+Wjh/OmFEZWkxj77PErzKN2DKzmONbMVbo/7NzchxnK0MdPycg80Wb9 UKkrw1aM3/Y0HqkYTOHYlhuFJ3KxjZ0yzfWMs+5K1AcKj1AZFr94eQAe7cOKAihBmPiP j3hfCNQ4CMXfLx90YfytaKNy9nOa74QNXihjdhcLvRDBFG948YAI3Y3bYs1WT+8WX14Y L4vA== 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=pXsI9gr23XFThxiezDxXj/aak8C2jyC3qysC+sLIHWU=; b=E/RnouFVD4fpQ7LXoiyW+ENxyR8p2ojoJ3eXnIMIITK6p/bzY5rXF/z3eeNOR4gAAA GhWn0Vz7UtRbg9CfAYr6JUHm9OAW+2zY1ssHlsSi9PgBF29sz0PKh5Dv25g5kSMoT4ZX 18VWrfcXmzYFhLEV86wtCpGHqEHFtCKlZHFXDveV5+m39QYcH09E138G6TtMCkb+DhRY CVWGdAoDfZOlGJIuSJ/SdtESTOYoivReeOtbsAPXbRfd5BfyMeis2bEx6w3+wlMdme38 +5f8Kyp50F+7ZCBWKEAVcwEW5bKGMNlve7LjYFXB2kPYrIHYJY5ESREfVvcwNPpvjD0E D54g== 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 g26-20020a50ee1a000000b00467a8cb10e2si3902821eds.282.2022.11.18.15.39.25; Fri, 18 Nov 2022 15:39:48 -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 S236381AbiKRXib (ORCPT + 99 others); Fri, 18 Nov 2022 18:38:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236280AbiKRXc0 (ORCPT ); Fri, 18 Nov 2022 18:32:26 -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 33CF3A6595 for ; Fri, 18 Nov 2022 15:20: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-0004hO-6g; 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-0058mJ-Qu; 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-0000Ph-Vt; 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 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 506/606] nfc: s3fwrn5: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:44:00 +0100 Message-Id: <20221118224540.619276-507-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?1749879136138859443?= X-GMAIL-MSGID: =?utf-8?q?1749879136138859443?= 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/s3fwrn5/i2c.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c index ecdee838d25d..2517ae71f9a4 100644 --- a/drivers/nfc/s3fwrn5/i2c.c +++ b/drivers/nfc/s3fwrn5/i2c.c @@ -177,8 +177,7 @@ static int s3fwrn5_i2c_parse_dt(struct i2c_client *client) return 0; } -static int s3fwrn5_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int s3fwrn5_i2c_probe(struct i2c_client *client) { struct s3fwrn5_i2c_phy *phy; int ret; @@ -262,7 +261,7 @@ static struct i2c_driver s3fwrn5_i2c_driver = { .name = S3FWRN5_I2C_DRIVER_NAME, .of_match_table = of_match_ptr(of_s3fwrn5_i2c_match), }, - .probe = s3fwrn5_i2c_probe, + .probe_new = s3fwrn5_i2c_probe, .remove = s3fwrn5_i2c_remove, .id_table = s3fwrn5_i2c_id_table, };