From patchwork Fri Nov 18 22:42:53 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: 23140 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp488490wrr; Fri, 18 Nov 2022 16:46:06 -0800 (PST) X-Google-Smtp-Source: AA0mqf6r1TmSy4TjMyHSfXop759LXIMVWLIJIrDshKA4VmDkk4cAZX6uXBdE4vZKMVPYFZ8gohyN X-Received: by 2002:a05:6402:3ce:b0:469:40c:ecfb with SMTP id t14-20020a05640203ce00b00469040cecfbmr5352835edw.164.1668818766468; Fri, 18 Nov 2022 16:46:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818766; cv=none; d=google.com; s=arc-20160816; b=RjSyiGi3RbPnx5v4aOGM/5NxYmpQk9YoQuJoMmHXMDRCLP9xHznhdz26/ErA5Z4lSL EMQdjkdNOVSSQ2m+c5WePUzRCP4yl8t2ww1N0eox1px4wkzIgRq14dqRdSD4zTm5GpBX Abvt8cHUHVdmqlpT/s3b+aAqI/jiZd/QQZhVjUJNaxNOwfOPfJfSpuc+4CNJcfxyP6uX Zz1nCDfFaK34mTGQXBb2TOi+afycqYutk7YVj6utz2FNE4UPPExbHtu/W4WTLLkmMR00 1mEb4ClnVic6v28KQ2+aPF5CIYubHD22lsknI57TW0GAoK49IXJCONo/i+x/hC2OijCo AY8g== 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=xnIu/K2aZski9vCRVr8bY3DDVp7RhcgP/waiyUqyzpk=; b=TTN7QFfh7Lsi8sJKDDx9JTqwQQWWTx/MiB3LT5hnSOS3Me1VtIoO6xO/Z9VUZwCYlE 3unSqSFFQ+LapHCuMoPdlTNNjD958cBfknrAFdQleZKq++b9VqT7pZJT2lUE/LHBYHHX sFhf6vpxnskeOiFR+AtMfZIEUvPvos6c8XChTxjQ69BMSTv9f/uLHHTTIaKuTTvu9/55 0VbSomI6wSxtm4mnCJ1pWemZXW1qMn91xFuFd6vXFhE2sYmHtldoTHB+N6yDOxXMOOOP O7o9SlD7BiiU7Di7u4I3ljvetLnpdEcCcIjLquP5L63JNFbRxmQDGXdl1RO8g9IDAuP4 JSDg== 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 hs36-20020a1709073ea400b00791bcf8aa5esi4431011ejc.739.2022.11.18.16.45.36; Fri, 18 Nov 2022 16:46:06 -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 S232849AbiKSAkg (ORCPT + 99 others); Fri, 18 Nov 2022 19:40:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235651AbiKSAjX (ORCPT ); Fri, 18 Nov 2022 19:39:23 -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 B43D4C768D for ; Fri, 18 Nov 2022 15:44:27 -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 1owA9I-0004DC-Al; Fri, 18 Nov 2022 23:47:52 +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 1owA9G-0058he-0A; Fri, 18 Nov 2022 23:47:50 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9D-0000LG-M5; Fri, 18 Nov 2022 23:47:47 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Lee Jones 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 439/606] mfd: max77620: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:42:53 +0100 Message-Id: <20221118224540.619276-440-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?1749883307196364176?= X-GMAIL-MSGID: =?utf-8?q?1749883307196364176?= 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/mfd/max77620.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c index 42fa9c4b97aa..cbd2297126f0 100644 --- a/drivers/mfd/max77620.c +++ b/drivers/mfd/max77620.c @@ -494,9 +494,9 @@ static void max77620_pm_power_off(void) MAX77620_ONOFFCNFG1_SFT_RST); } -static int max77620_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int max77620_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); const struct regmap_config *rmap_config; struct max77620_chip *chip; const struct mfd_cell *mfd_cells; @@ -698,7 +698,7 @@ static struct i2c_driver max77620_driver = { .name = "max77620", .pm = pm_sleep_ptr(&max77620_pm_ops), }, - .probe = max77620_probe, + .probe_new = max77620_probe, .id_table = max77620_id, }; builtin_i2c_driver(max77620_driver);