From patchwork Fri Nov 18 22:44:45 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: 22910 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp472881wrr; Fri, 18 Nov 2022 16:01:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Gk7WW970fpcjW/DDv8qfgFQRwPpvlh4RuAFSJD2PonQIB20JuY5PUmrCrEdvLQIlFEbfi X-Received: by 2002:a17:90a:4ece:b0:218:7c55:47de with SMTP id v14-20020a17090a4ece00b002187c5547demr7668586pjl.172.1668816065084; Fri, 18 Nov 2022 16:01:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668816065; cv=none; d=google.com; s=arc-20160816; b=LQfQGmrq18sCMBBKGL70YMCzciBPm9Gg7hTVU11uZhdRq7gZwBO0JTkZ/7dUC0inJt F4o4Q5cYzXP2kyVU7w+b4t01a9Rk7I69TGa2udRy5wE+3WbGr24l1+4ILh6TRKx7LB/R wckMKC5BZMrpKOHd/JQw9owKAmDfYPcHb6nMCL/2LJl0h9DChElNnCH3fdHjS4Yu13d5 608gJyDoOo3Lsy7sotllleXZ3WzMJwOo0xUAWzeIJ+9ZDSk2oYvMVA410OYFjsOA9t3I RjZNIWWRtR623AhXX5SM8COynZ/cxOmpClsE25C8vWIXh23mnzfvPxmtLfJIq92qB5ez 9Q7w== 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=BvjUmXTNFB2p9GQ5Blvl/D7ptBUSTVHPRNH+njjETTs=; b=Nzc355F+XpH+SI2D2KPeG8nvu7NKizUIuQzhF7Ko20HvH+TjrTkfhGPq+5gadXvnbz dfo94U7hqBve4k3/oDTY8tWEt7HWxK3QY28PYB5PIuHNVDjhRABWuTljXq2wWytF6iGz mdD5fPUQ+AJIucgMVgGizr8c3ziuvp1wNJlBaIPF3fZDW5bmK32ZxofoXEKdkMxGMJ3v NHbP04UJ8P2wMckmzh+MqLj7Idqxa9Y3ImPLxhfMfcK/dRfRd1pPYMnve59CMmRxEKiH 07x+SGs6I8woy1Jaa5shUc31IOU36m9F0Npf8tHTkZlX/sSbXwkNZM43rPcgbvt7HaLX VZbQ== 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 f34-20020a635122000000b00477055c8479si4999658pgb.525.2022.11.18.16.00.51; Fri, 18 Nov 2022 16:01:05 -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 S236615AbiKRX4D (ORCPT + 99 others); Fri, 18 Nov 2022 18:56:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233817AbiKRXyo (ORCPT ); Fri, 18 Nov 2022 18:54:44 -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 09C9CCB686 for ; Fri, 18 Nov 2022 15:27:57 -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 1owA9d-00058r-IE; Fri, 18 Nov 2022 23:48:13 +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 1owA9a-0058q7-Ui; Fri, 18 Nov 2022 23:48:11 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9a-0000Sc-C5; Fri, 18 Nov 2022 23:48:10 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Liam Girdwood , Mark Brown Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-kernel@vger.kernel.org Subject: [PATCH 551/606] regulator: max8973-regulator: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:44:45 +0100 Message-Id: <20221118224540.619276-552-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=ham 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?1749880474725349874?= X-GMAIL-MSGID: =?utf-8?q?1749880474725349874?= From: Uwe Kleine-König .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in the probe function. Signed-off-by: Uwe Kleine-König --- drivers/regulator/max8973-regulator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c index 596cc36aaff6..7e00a45db26a 100644 --- a/drivers/regulator/max8973-regulator.c +++ b/drivers/regulator/max8973-regulator.c @@ -586,9 +586,9 @@ static const struct of_device_id of_max8973_match_tbl[] = { }; MODULE_DEVICE_TABLE(of, of_max8973_match_tbl); -static int max8973_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int max8973_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct max8973_regulator_platform_data *pdata; struct regulator_init_data *ridata; struct regulator_config config = { }; @@ -806,7 +806,7 @@ static struct i2c_driver max8973_i2c_driver = { .name = "max8973", .of_match_table = of_max8973_match_tbl, }, - .probe = max8973_probe, + .probe_new = max8973_probe, .id_table = max8973_id, };