From patchwork Fri Mar 31 07:03:44 2023 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: 77564 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp375703vqo; Fri, 31 Mar 2023 00:16:21 -0700 (PDT) X-Google-Smtp-Source: AKy350ZsydU6bVm5UsZzfjFmkw8WVUriXsmNgYdX6GoJDKQ9zaSaIjEOLDkm3UZY0KYiRMPkSRtA X-Received: by 2002:aa7:cc04:0:b0:4fa:fcee:1727 with SMTP id q4-20020aa7cc04000000b004fafcee1727mr21735635edt.13.1680246981210; Fri, 31 Mar 2023 00:16:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680246981; cv=none; d=google.com; s=arc-20160816; b=yC+UK/ljeoN9unR/lJLLGx7nHx2gNvqgnGHNtvgvpLZ+iHBGeIJ1FTMrDufoWWhuVH ZpSXY3XTntLWZLI4gkmUXcfpoAHjV7CzB2mJcSpuBFy9OvbSwnLG7Fwdc4gnxfh/nZCn 4Q7doEPGKVW9slse9etYUdL9paiFksNmjeLqxbqDuf5Ie+kgEj2k3190tVmnWdmNQJ8q QjNYfawfybLyNri7mjNbkcXctA7FQrZrLwME6KZ+89s+INuOzVCDYSFt1PrhPonyq4VJ OZ15NVKbAT/K5Mut80+nBJ+rObJ8Q/m1Wpa34MyzcZGEaJjYLJWGZJL6Hyyww9VVkCIR kPcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=hZmYvQXthRZoq7gAsTwOsVjsjArrd4QDGqUj659VOto=; b=uJAmlKALiYHPBf053FHo23iSsBUepQK8lVRxdJH5KZFYtVSv0Qe+fCyYgmpY9xxsgD DQ2aENatneetBEsyItv9tLXR0CWV96SO95gBq9iP7IClt6xXtEieEOzPnr5NBWws/BfO WY+1/RYCzIEpgL7EXG3jsupRq+XkMB9BBDawuuA/ZGFUSyVojZXYoUsul331nPy17q9I yFP4+UEMBJEW246ksy6aFwO2uPqrTzy4waRNw3Qky6t8DUw+wpUbl6eR9d9rHCmuYOVF QELJdFIetQc1ZTaFH8hJ4dycYQPXWNTlzchmKJ39NhTq9dQB32ZNwxhL2AQCX8MaeatA 3HkA== 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 g14-20020a056402114e00b004acce6da55bsi1504065edw.33.2023.03.31.00.15.54; Fri, 31 Mar 2023 00:16:21 -0700 (PDT) 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 S230403AbjCaHE0 (ORCPT + 99 others); Fri, 31 Mar 2023 03:04:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230375AbjCaHEK (ORCPT ); Fri, 31 Mar 2023 03:04:10 -0400 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 BE798191E2 for ; Fri, 31 Mar 2023 00:04:08 -0700 (PDT) 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 1pi8nd-0005QG-EE; Fri, 31 Mar 2023 09:03:49 +0200 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 1pi8na-007w9x-9N; Fri, 31 Mar 2023 09:03:46 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pi8nZ-009NeF-ES; Fri, 31 Mar 2023 09:03:45 +0200 Date: Fri, 31 Mar 2023 09:03:44 +0200 From: Uwe =?utf-8?q?Kleine-K=C3=B6nig?= To: Stephen Rothwell Cc: Lee Jones , Wolfram Sang , Min Li , Linux Kernel Mailing List , Linux Next Mailing List Subject: [PATCH] mfd: rsmu_i2c: Convert to i2c's .probe_new() again Message-ID: <20230331070344.czphnnmvu2ojzo5l@pengutronix.de> References: <20230331121525.42c861fe@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230331121525.42c861fe@canb.auug.org.au> 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=-2.3 required=5.0 tests=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?1761866658977678615?= X-GMAIL-MSGID: =?utf-8?q?1761866658977678615?= This commit reapplies commit 601e6d48ee35 ("mfd: rsmu_i2c: Convert to i2c's .probe_new()") which was accidently reverted by commit 1b3b1d6c27cc ("mfd: rsmu: Support 32-bit address space"). Without this change the driver fails to build in combination with commit 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") which is contained in v6.3-rc2. Fixes: 1b3b1d6c27cc ("mfd: rsmu: Support 32-bit address space") Signed-off-by: Uwe Kleine-König --- Hello, On Fri, Mar 31, 2023 at 12:15:25PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/mfd/rsmu_i2c.c:282:18: error: initialization of 'int (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *, const struct i2c_device_id *)' [-Werror=incompatible-pointer-types] > 282 | .probe = rsmu_i2c_probe, > | ^~~~~~~~~~~~~~ > drivers/mfd/rsmu_i2c.c:282:18: note: (near initialization for 'rsmu_i2c_driver..probe') > > Caused by commit > > 1b3b1d6c27cc ("mfd: rsmu: Support 32-bit address space") This commit is strange as it undoes commit 601e6d48ee3519648679177a0647dd3b3cbaefbb without mentioning that. I guess the reason is a wrong conflict resolution when the address space patch was rebased. > interacting with commit > > 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") > > from Linus' tree (v6.3-rc2). > > I applied the following merge fix patch (which may not be right :-(): > > From: Stephen Rothwell > Date: Fri, 31 Mar 2023 12:05:44 +1100 > Subject: [PATCH] fixup for "mfd: rsmu: Support 32-bit address space" > > interacting with "i2c: Switch .probe() to not take an id parameter" > > Signed-off-by: Stephen Rothwell > --- > drivers/mfd/rsmu_i2c.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mfd/rsmu_i2c.c b/drivers/mfd/rsmu_i2c.c > index 221023faaadf..26972a5aff45 100644 > --- a/drivers/mfd/rsmu_i2c.c > +++ b/drivers/mfd/rsmu_i2c.c > @@ -201,9 +201,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; Nearly right. This works as fix for a tree that has the above mentioned commits. But in the mfd tree sturct i2c_driver::probe still takes the id parameter. So to actually prevent the build failure between the merge of mfd and Linus's tree, the right thing is to reapply commit 601e6d48ee35 ("mfd: rsmu_i2c: Convert to i2c's .probe_new()") on the mfd tree. Best regards Uwe drivers/mfd/rsmu_i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) base-commit: 1b3b1d6c27cc0bfda4326de574f9d73f13a26bc4 diff --git a/drivers/mfd/rsmu_i2c.c b/drivers/mfd/rsmu_i2c.c index 221023faaadf..807c32101460 100644 --- a/drivers/mfd/rsmu_i2c.c +++ b/drivers/mfd/rsmu_i2c.c @@ -201,9 +201,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; @@ -279,7 +279,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, };