From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5646BC433FE for ; Wed, 23 Nov 2022 04:55:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235710AbiKWEzb (ORCPT ); Tue, 22 Nov 2022 23:55:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235672AbiKWEzS (ORCPT ); Tue, 22 Nov 2022 23:55:18 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09132E0685 for ; Tue, 22 Nov 2022 20:55:18 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 96E5A61A55 for ; Wed, 23 Nov 2022 04:55:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF40AC43146; Wed, 23 Nov 2022 04:55:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669179317; bh=Hha/PZ9e9uaNOICKSzmUwuppjBfKYrFtF+2dhxdog0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C/YvIUzxWRGsiEEmiI7fOxCfKSe5NUS3+we/4FOa9Kz9MyZZ2UymF1Qd5j4/T3yZE wMkslMCCOOQWxmRF0mGrq4XCwI61UqK3jHY6Sem1wuqbXfVH/uznS3bTRuD+7Uym1z 4rUtKptNQDdzMnwm3ZCpXOlAbPrDQKaeVq72EomxeKDxX6lTEn8xFngPxye+6bN7eX LS6pJmyGLn0QqL2SpXCqDc8kseXP7cTgmO2G6wY4GXqeo4p7qs0wlr2uWL9ehTsryt FOJwSejxrOnTJKCdlUzmHK/ZM9hQVQq835r9gufmcrAxsu2viDAiY9cwX4xIDsEN28 UKxMeULwRpeXg== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, uwe@kleine-koenig.org, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Subject: [PATCH net-next v2 12/12] nfc: st21nfca: i2c: Convert to i2c's .probe_new() Date: Tue, 22 Nov 2022 20:55:07 -0800 Message-Id: <20221123045507.2091409-13-kuba@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221123045507.2091409-1-kuba@kernel.org> References: <20221123045507.2091409-1-kuba@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@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/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, }; -- 2.38.1