Message ID | 20230612072807.839689-1-u.kleine-koenig@pengutronix.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2418466vqr; Mon, 12 Jun 2023 00:51:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5OVuRdDeujy38pZpn33nTYVBZnbDq2kCbxdSj1AjkAW0p6F9JFCEWsQn9Oq1meoKVLzuSX X-Received: by 2002:a17:902:e54a:b0:1b2:6387:a30d with SMTP id n10-20020a170902e54a00b001b26387a30dmr6213152plf.35.1686556305121; Mon, 12 Jun 2023 00:51:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686556305; cv=none; d=google.com; s=arc-20160816; b=Wj3PA9lkB+z5/95qk5bwd0yzWJaFVS7DoCyYpMIbnJ4h2682SWe0ZlZCTIdghv2Gf0 dEJMGG09UxTgrI6fco57UtFtbkh2z6iSwmCe1i5jzIfC0uxelXmei24etA0QBpTMJtX8 C/Irt2xGLRSSWtP8I2mfQ+oI8BdmTV1Uq1REC0kuYokNKt7QzSoCQSCCHmK6cndK2sFd kw4guFZJioHI6I9aSiygZXd55IspNUUvTLdIAiE1u9fat2Cp/Xb8p+cvoJFrsZPmyf83 OoJUufXsB9/0vfszuBdRTtQX9QMZbuWUf3i16qQIDPkxh4zaO1S30EaVPLD/GhxOWZS+ MDqw== 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 :message-id:date:subject:cc:to:from; bh=bFY8IYHoh6WQ5M7uqCfBv472ElOUuYxEGr0LNhePr1o=; b=Bjme53+u0cQseVssTfmtVNX0KfqLGyMVUc+KDNMEAm1evA8YyImuOx49jyN+tbunlQ ARbE1b+DmQXpvVi9gynxq4wwp3JfhB1L1WCvSufeidacnXuonYvXmCQBnl/TDw7iq+aL o6iWAATI8+5STs8HZEnQ4p+GQ8g2V7Hd7eYtN3iPSQLr/WVn7NrRNaj1kaQnNhAr0H0w AXav6QXXkCRK/x/W4mrr38kyPZkKMVNlWEfZVlZI5ncTzDTcV093W2yom31D2HKLPso4 YxwuztUPbOE9QYktV3xZhoZvHM5mRVLPFDdlVt+AumiKWylekaeQCvayCMxKpyLjWOU4 J5kw== 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 lh5-20020a170903290500b001b23e9f586asi2718312plb.121.2023.06.12.00.51.31; Mon, 12 Jun 2023 00:51:45 -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 S234985AbjFLHn0 (ORCPT <rfc822;rust.linux@gmail.com> + 99 others); Mon, 12 Jun 2023 03:43:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235149AbjFLHnV (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 12 Jun 2023 03:43:21 -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 3D6941995 for <linux-kernel@vger.kernel.org>; Mon, 12 Jun 2023 00:42:49 -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 <ukl@pengutronix.de>) id 1q8byE-0002bj-Fa; Mon, 12 Jun 2023 09:28:10 +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 <ukl@pengutronix.de>) id 1q8byD-006pif-Qh; Mon, 12 Jun 2023 09:28:09 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from <ukl@pengutronix.de>) id 1q8byC-00DQhk-Uo; Mon, 12 Jun 2023 09:28:08 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH] w1: ds2482: Switch back to use struct i2c_driver's .probe() Date: Mon, 12 Jun 2023 09:28:07 +0200 Message-Id: <20230612072807.839689-1-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=955; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=F1tfiz6xeXVPZ1tOCA3JD5eV1SuaWUfQF3XHAx6RGFQ=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBkhskGPoV3XrU1Ob0KI3BPIAtbGzzh8xQksIYiM RFHEtZQc0KJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZIbJBgAKCRCPgPtYfRL+ TgOyB/9MiXFKsmAFTEPON2f7rbbMzFmJ25UuJU0QN4hqlfSKeTVLuH5mvHYEGXQteWNn5MBhscd c7EtHnVLT7ZjTO6MLuCSNX12TtO/TFRD7iunn/56uSLFPKfLLaWmJltSctiLVmimIgZ7IC/MZoE RfC6mYSIQJmZ8Uw5nVF8NC/LEl1MgrYumNVjPuNpwiiXIRranY/b6dAt5tpozw4OaKKZoPIDXoj 4AHKDWQVpWarq0NvYYoF/TwvVKDsHlvgaV5itr2NkKtke1hORHZHqqQxldgceq46nTCfJ5waWuJ N5S0SEqe6rDHWjhORjXuoMEITgu6VsGSgYt0naJHSG5JmshY X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: 8bit 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.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768482464035437766?= X-GMAIL-MSGID: =?utf-8?q?1768482464035437766?= |
Series |
w1: ds2482: Switch back to use struct i2c_driver's .probe()
|
|
Commit Message
Uwe Kleine-König
June 12, 2023, 7:28 a.m. UTC
After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
commit 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter")
convert back to (the new) .probe() to be able to eventually drop
.probe_new() from struct i2c_driver.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/w1/masters/ds2482.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
base-commit: ac9a78681b921877518763ba0e89202254349d1b
Comments
On 12/06/2023 09:28, Uwe Kleine-König wrote: > After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() > call-back type"), all drivers being converted to .probe_new() and then > commit 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") > convert back to (the new) .probe() to be able to eventually drop > .probe_new() from struct i2c_driver. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/w1/masters/ds2482.c | 2 +- Thank you for the patch. It is too late in the cycle for me to pick it up. I will take it after the merge window. Best regards, Krzysztof
Hello Krzysztof, On Mon, Jun 12, 2023 at 10:10:30PM +0200, Krzysztof Kozlowski wrote: > On 12/06/2023 09:28, Uwe Kleine-König wrote: > > After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() > > call-back type"), all drivers being converted to .probe_new() and then > > commit 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") > > convert back to (the new) .probe() to be able to eventually drop > > .probe_new() from struct i2c_driver. > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > --- > > drivers/w1/masters/ds2482.c | 2 +- > > Thank you for the patch. > It is too late in the cycle for me to pick it up. I will take it after > the merge window. This is one of only 19 patches that are still needed on top of what is currently in next before I can drop .probe_new() which I intended to tackle after the upcoming merge window. I expect that most of these 19 patches will still be picked up and go into v6.5-rc1. Assuming there are only less than 10 patches remaining on top of v6.5-rc1, I intend to create a pull request for Wolfram with the remaining bits and a patch doing diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 13a1ce38cb0c..3b2434812611 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -237,7 +237,6 @@ enum i2c_driver_flags { * struct i2c_driver - represent an I2C device driver * @class: What kind of i2c device we instantiate (for detect) * @probe: Callback for device binding - * @probe_new: Transitional callback for device binding - do not use * @remove: Callback for device unbinding * @shutdown: Callback for device shutdown * @alert: Alert callback, for example for the SMBus alert protocol @@ -272,16 +271,8 @@ enum i2c_driver_flags { struct i2c_driver { unsigned int class; - union { /* Standard driver model interfaces */ - int (*probe)(struct i2c_client *client); - /* - * Legacy callback that was part of a conversion of .probe(). - * Today it has the same semantic as .probe(). Don't use for new - * code. - */ - int (*probe_new)(struct i2c_client *client); - }; + int (*probe)(struct i2c_client *client); void (*remove)(struct i2c_client *client); early after v6.5-rc1. So an ack from your side would be very welcome. Best regards Uwe
Hi Uwe, On Mon, Jun 12, 2023 at 09:28:07AM +0200, Uwe Kleine-König wrote: > After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() > call-back type"), all drivers being converted to .probe_new() and then > commit 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") > convert back to (the new) .probe() to be able to eventually drop > .probe_new() from struct i2c_driver. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> if needed: Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Andi
On 13/06/2023 09:02, Uwe Kleine-König wrote: > Hello Krzysztof, > > On Mon, Jun 12, 2023 at 10:10:30PM +0200, Krzysztof Kozlowski wrote: >> On 12/06/2023 09:28, Uwe Kleine-König wrote: >>> After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() >>> call-back type"), all drivers being converted to .probe_new() and then >>> commit 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") >>> convert back to (the new) .probe() to be able to eventually drop >>> .probe_new() from struct i2c_driver. >>> >>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> >>> --- >>> drivers/w1/masters/ds2482.c | 2 +- >> >> Thank you for the patch. >> It is too late in the cycle for me to pick it up. I will take it after >> the merge window. > > This is one of only 19 patches that are still needed on top of what is > currently in next before I can drop .probe_new() which I intended to > tackle after the upcoming merge window. I expect that most of these 19 > patches will still be picked up and go into v6.5-rc1. > > Assuming there are only less than 10 patches remaining on top of > v6.5-rc1, I intend to create a pull request for Wolfram with the > remaining bits and a patch doing Sure, go ahead: Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On Tue, Jun 13, 2023 at 10:06:46AM +0200, Krzysztof Kozlowski wrote: > On 13/06/2023 09:02, Uwe Kleine-König wrote: > > Hello Krzysztof, > > > > On Mon, Jun 12, 2023 at 10:10:30PM +0200, Krzysztof Kozlowski wrote: > >> On 12/06/2023 09:28, Uwe Kleine-König wrote: > >>> After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() > >>> call-back type"), all drivers being converted to .probe_new() and then > >>> commit 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") > >>> convert back to (the new) .probe() to be able to eventually drop > >>> .probe_new() from struct i2c_driver. > >>> > >>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > >>> --- > >>> drivers/w1/masters/ds2482.c | 2 +- > >> > >> Thank you for the patch. > >> It is too late in the cycle for me to pick it up. I will take it after > >> the merge window. > > > > This is one of only 19 patches that are still needed on top of what is > > currently in next before I can drop .probe_new() which I intended to > > tackle after the upcoming merge window. I expect that most of these 19 > > patches will still be picked up and go into v6.5-rc1. > > > > Assuming there are only less than 10 patches remaining on top of > > v6.5-rc1, I intend to create a pull request for Wolfram with the > > remaining bits and a patch doing > > Sure, go ahead: > > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Thanks, but this didn't happen because I missed a few introductions of new .probe_new. My plan was rescheduled to one merge window later. So if you want to take this for v6.6-rc1 that would be great. Best regards Uwe
On 20/07/2023 10:52, Uwe Kleine-König wrote: > On Tue, Jun 13, 2023 at 10:06:46AM +0200, Krzysztof Kozlowski wrote: >> On 13/06/2023 09:02, Uwe Kleine-König wrote: >>> Hello Krzysztof, >>> >>> On Mon, Jun 12, 2023 at 10:10:30PM +0200, Krzysztof Kozlowski wrote: >>>> On 12/06/2023 09:28, Uwe Kleine-König wrote: >>>>> After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() >>>>> call-back type"), all drivers being converted to .probe_new() and then >>>>> commit 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") >>>>> convert back to (the new) .probe() to be able to eventually drop >>>>> .probe_new() from struct i2c_driver. >>>>> >>>>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> >>>>> --- >>>>> drivers/w1/masters/ds2482.c | 2 +- >>>> >>>> Thank you for the patch. >>>> It is too late in the cycle for me to pick it up. I will take it after >>>> the merge window. >>> >>> This is one of only 19 patches that are still needed on top of what is >>> currently in next before I can drop .probe_new() which I intended to >>> tackle after the upcoming merge window. I expect that most of these 19 >>> patches will still be picked up and go into v6.5-rc1. >>> >>> Assuming there are only less than 10 patches remaining on top of >>> v6.5-rc1, I intend to create a pull request for Wolfram with the >>> remaining bits and a patch doing >> >> Sure, go ahead: >> >> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > Thanks, but this didn't happen because I missed a few introductions of > new .probe_new. My plan was rescheduled to one merge window later. So if > you want to take this for v6.6-rc1 that would be great. > I don't have anything in w1 queue, so it would be easier if you take it with the rest. Best regards, Krzysztof
Hello Krzysztof, On Wed, Jul 26, 2023 at 10:21:39AM +0200, Krzysztof Kozlowski wrote: > On 20/07/2023 10:52, Uwe Kleine-König wrote: > > On Tue, Jun 13, 2023 at 10:06:46AM +0200, Krzysztof Kozlowski wrote: > >> On 13/06/2023 09:02, Uwe Kleine-König wrote: > >>> Assuming there are only less than 10 patches remaining on top of > >>> v6.5-rc1, I intend to create a pull request for Wolfram with the > >>> remaining bits and a patch doing > >> > >> Sure, go ahead: > >> > >> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > > > Thanks, but this didn't happen because I missed a few introductions of > > new .probe_new. My plan was rescheduled to one merge window later. So if > > you want to take this for v6.6-rc1 that would be great. > > I don't have anything in w1 queue, so it would be easier if you take it > with the rest. OK, will do. Thanks Uwe
diff --git a/drivers/w1/masters/ds2482.c b/drivers/w1/masters/ds2482.c index c1de8a92e144..b2d76c1784bd 100644 --- a/drivers/w1/masters/ds2482.c +++ b/drivers/w1/masters/ds2482.c @@ -551,7 +551,7 @@ static struct i2c_driver ds2482_driver = { .driver = { .name = "ds2482", }, - .probe_new = ds2482_probe, + .probe = ds2482_probe, .remove = ds2482_remove, .id_table = ds2482_id, };