From patchwork Fri Nov 18 22:43:09 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: 23054 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp486680wrr; Fri, 18 Nov 2022 16:40:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf58/VHHgNcCKuyaLBT3FqLGvoYUcOgYukTCL/vBwA6gImQvIjd8vxLC5fjah5Yj/VbakSMD X-Received: by 2002:a17:907:9890:b0:783:6c5:c49e with SMTP id ja16-20020a170907989000b0078306c5c49emr8071094ejc.483.1668818451152; Fri, 18 Nov 2022 16:40:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818451; cv=none; d=google.com; s=arc-20160816; b=ITyuYNtJMTN8BvGSN222n0wN6vY5jv8nb5eTI7WVOJnZlqtkWChpk/XXEAlJwy2GKt KScBUTZf2yrrQ3cN6gj340rrDFvd5b6KyZtSEGNxWJrax3yPJ+L8kJp7MHxasd1hMx9h PGu5vE5rExlKF3owYg9Lk8Qi5zwGKjEIkzzw7ZmlML2WZcYVDIkfw8lkc0BgjMiX+NRk xP9lJgecn4TeR1LJbHIS0HdVRlKsLCQXvNji5smV+7XMnN5YbOQHsfAHDufjFKzn0VA6 R46o+eE6vMpCXHg1Esk8nTThV3m2Tz9oTycHqnyLdLRZKOpPsys7Iq7zGaAOciBqk+i9 JUMA== 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=cdF3uSRpYEFxBAj31cwqAgPYzEwwAMJOlJkGPZy0GVo=; b=IcWiyT2mCicHMq/5kRAFS2mzY59okesXy2uN1aiAZ9zEYH1u7L8R9yC5DH7wlN916z MNiI0Pa+YBw9ubojmcL5H8GEqPvbCAXDSa95X2dw0TiHSkLdWuaS+6co8rDPFnJu+rEG /D847rUGf/o5E1PYzajmCjsAG1K0oVMupj/R37ebsuQYBJ0euokP34JWtwQISnh/znLa D6N9uldZcOOwlOzyvr9w0ofjTSj4TR4WeqWc3GdWxORgJ6onpohiANScd1RzY/aQ8W5Y O7ONkSSnE2NOD+cZxt6EUo0O9XCpBVCKESFtoA5dxmemHtlrcps7TrS44jfTz3Qllar5 xp9A== 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 wz5-20020a170906fe4500b0078fcfc5d24esi4993843ejb.618.2022.11.18.16.40.27; Fri, 18 Nov 2022 16:40:51 -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 S236007AbiKSAZ4 (ORCPT + 99 others); Fri, 18 Nov 2022 19:25:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232171AbiKSAZY (ORCPT ); Fri, 18 Nov 2022 19:25:24 -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 96617105AB1 for ; Fri, 18 Nov 2022 15:38:40 -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 1owA9J-0004GR-Qe; Fri, 18 Nov 2022 23:47:53 +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 1owA9H-0058i8-6D; Fri, 18 Nov 2022 23:47:52 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9H-0000MK-0A; Fri, 18 Nov 2022 23:47:51 +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 455/606] mfd: rsmu_i2c: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:43:09 +0100 Message-Id: <20221118224540.619276-456-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?1749882976360694303?= X-GMAIL-MSGID: =?utf-8?q?1749882976360694303?= 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/rsmu_i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/rsmu_i2c.c b/drivers/mfd/rsmu_i2c.c index f716ab8039a0..15d25b081434 100644 --- a/drivers/mfd/rsmu_i2c.c +++ b/drivers/mfd/rsmu_i2c.c @@ -106,9 +106,9 @@ static const struct regmap_config rsmu_sl_regmap_config = { .can_multi_write = true, }; -static int rsmu_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int rsmu_i2c_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); const struct regmap_config *cfg; struct rsmu_ddata *rsmu; int ret; @@ -180,7 +180,7 @@ static struct i2c_driver rsmu_i2c_driver = { .name = "rsmu-i2c", .of_match_table = of_match_ptr(rsmu_i2c_of_match), }, - .probe = rsmu_i2c_probe, + .probe_new = rsmu_i2c_probe, .remove = rsmu_i2c_remove, .id_table = rsmu_i2c_id, };