From patchwork Fri Nov 18 22:42:52 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: 22925 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp474480wrr; Fri, 18 Nov 2022 16:04:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf6E+5iByOz/npfVGk3Ud7erNJ9zRfm/O8U0A2ZdwF8PtDz9mPWE9mMN1to0AGeqwdo7jFhM X-Received: by 2002:a63:5c23:0:b0:46f:b6e1:1966 with SMTP id q35-20020a635c23000000b0046fb6e11966mr8482974pgb.625.1668816258914; Fri, 18 Nov 2022 16:04:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668816258; cv=none; d=google.com; s=arc-20160816; b=Z9ZD0+8hqczrhlnr47SyazF4e94wqNtN6ozBYCnKxNIO1e1szFv57KItmgdMKfAgo+ Uwv4AdTFmFFBMU5Iv8FStR2bqvk4AKpeIXTCBo9GZuu8FT3Z5ToQDrQxpAGaxX/nBkzi yw3McwpY/8NlKYY6fI9LeLSJFDB20DyPDgecv9S7OTQ9UHRielSRyaofeDk28F3WYyk+ PPJLTdmcnPNtz58EmFQuuHB9MteCijJMUUBpyjFCr/QLiBPh5fn2bj9qMJffuO/WWtl4 s5JFRUuT68lDE9mBSAG3BYQTnlzX5Hn54NHihtTMxx7N9iN/OuXFFSdkgp1oL/y8GCX7 ssWA== 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=ssxXvDbkDsIAT0YkSi9dJkF3ayJXlFWr5SEzWun3D7E=; b=XnHxH8QBeRsbAi+4fiGiPqheAye02T2VDBskYplMEjo9Tcg1LLxOpdByCxXzQ2R0+X vbzaZWjN1IUWKHUwQz6UN3KozxKJJFp8glOppvMuw0PTStpOnp56k12vjbWNy2FNoxhX EsGFeI6BiQbrWut2Q/TeEGaAQYUeEoo9XbMDXytHSdoeSJXGWa8mwpA5Rgb+M7zstlUK +LorLQ38hKeXNpL747Sg0HUqSWg6L4CcgLPgOY7910EelwMU1SJuVbMVj6YOmkhl9sMM pEGi5NP39hi9Hxx6exeNrHKtihda+qa72XOAC1hUAnflOEuI7NHf+AF0S7E9Y3JFlBcH 4P2g== 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 w16-20020a056a0014d000b0056ba70bef19si4987928pfu.350.2022.11.18.16.04.05; Fri, 18 Nov 2022 16:04:18 -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 S237217AbiKRX7Z (ORCPT + 99 others); Fri, 18 Nov 2022 18:59:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236334AbiKRX4m (ORCPT ); Fri, 18 Nov 2022 18:56:42 -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 4DCF0218C for ; Fri, 18 Nov 2022 15:28:30 -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 1owA9G-00047p-Mt; Fri, 18 Nov 2022 23:47:50 +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 1owA9E-0058gw-C7; Fri, 18 Nov 2022 23:47:49 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9D-0000LC-GX; 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 , Chanwoo Choi , Krzysztof Kozlowski , 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 438/606] mfd: max14577: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:42:52 +0100 Message-Id: <20221118224540.619276-439-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?1749880677308337501?= X-GMAIL-MSGID: =?utf-8?q?1749880677308337501?= 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/max14577.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/max14577.c b/drivers/mfd/max14577.c index 92c7f342c865..c59822637338 100644 --- a/drivers/mfd/max14577.c +++ b/drivers/mfd/max14577.c @@ -358,9 +358,9 @@ static void max77836_remove(struct max14577 *max14577) i2c_unregister_device(max14577->i2c_pmic); } -static int max14577_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int max14577_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct max14577 *max14577; struct max14577_platform_data *pdata = dev_get_platdata(&i2c->dev); struct device_node *np = i2c->dev.of_node; @@ -521,7 +521,7 @@ static struct i2c_driver max14577_i2c_driver = { .pm = pm_sleep_ptr(&max14577_pm), .of_match_table = max14577_dt_match, }, - .probe = max14577_i2c_probe, + .probe_new = max14577_i2c_probe, .remove = max14577_i2c_remove, .id_table = max14577_i2c_id, };