| Message ID | 20230721071846.111663-1-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | clk: versaclock3: Switch to use i2c_driver's probe callback | expand |
Hello, [Cc: += Wolfram] On Fri, Jul 21, 2023 at 09:18:46AM +0200, Uwe Kleine-König wrote: > The previous mass switch of clk drivers done in commit 62279db5a323 > ("clk: Switch i2c drivers back to use .probe()") was based on v6.4-rc1 > Since then this driver was added which needs to be converted back in the > same way before eventually .probe_new() can be dropped from struct > i2c_driver. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > Hello, > > this driver appeared in next today. It would be great if this patch > could be added on top to not interfere with the quest to remove > .probe_new directly after v6.6-rc1. my eventual plan is to send the patch removing .probe_new() around v6.6-rc1 with the intention to get it into next early during the merge window. So if this patch doesn't make it in before v6.6-rc1, I'd send it together with the change dropping .probe_new() for Wolfram to apply as in today's next-20230731 there are only two drivers left making use of .probe_new (and the maintainer of the other driver already agreed to fix their driver with a patch going in via i2c, too). So in my order of preference, the options here are: - patch is applied via clk before v6.6-rc1 - patch is applied via i2c together with change dropping .probe_new() with a clk maintainer's Ack. - patch is ignored and goes in without an Ack via i2c. My current WIP branch based on v6.5-rc4 is available at https://git.pengutronix.de/git/ukl/linux i2c-probe-new if you want to take a look. (And even if you don't want, it's there :-) Thanks Uwe
Quoting Uwe Kleine-König (2023-07-21 00:18:46) > The previous mass switch of clk drivers done in commit 62279db5a323 > ("clk: Switch i2c drivers back to use .probe()") was based on v6.4-rc1 > Since then this driver was added which needs to be converted back in the > same way before eventually .probe_new() can be dropped from struct > i2c_driver. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- Applied to clk-next
Quoting Uwe Kleine-König (2023-07-31 01:18:03) > > Hello, > > > > this driver appeared in next today. It would be great if this patch > > could be added on top to not interfere with the quest to remove > > .probe_new directly after v6.6-rc1. > > my eventual plan is to send the patch removing .probe_new() around > v6.6-rc1 with the intention to get it into next early during the merge > window. So if this patch doesn't make it in before v6.6-rc1, I'd send it > together with the change dropping .probe_new() for Wolfram to apply as > in today's next-20230731 there are only two drivers left making use of > .probe_new (and the maintainer of the other driver already agreed to fix > their driver with a patch going in via i2c, too). > > So in my order of preference, the options here are: > > - patch is applied via clk before v6.6-rc1 This option is now the plan. > - patch is applied via i2c together with change dropping .probe_new() > with a clk maintainer's Ack. > - patch is ignored and goes in without an Ack via i2c. >
diff --git a/drivers/clk/clk-versaclock3.c b/drivers/clk/clk-versaclock3.c index 4ceb7fcf7fcb..7ab2447bd203 100644 --- a/drivers/clk/clk-versaclock3.c +++ b/drivers/clk/clk-versaclock3.c @@ -1134,7 +1134,7 @@ static struct i2c_driver vc3_driver = { .name = "vc3", .of_match_table = of_match_ptr(dev_ids), }, - .probe_new = vc3_probe, + .probe = vc3_probe, }; module_i2c_driver(vc3_driver);
The previous mass switch of clk drivers done in commit 62279db5a323 ("clk: Switch i2c drivers back to use .probe()") was based on v6.4-rc1 Since then this driver was added which needs to be converted back in the same way before eventually .probe_new() can be dropped from struct i2c_driver. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- Hello, this driver appeared in next today. It would be great if this patch could be added on top to not interfere with the quest to remove .probe_new directly after v6.6-rc1. Thanks Uwe drivers/clk/clk-versaclock3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 6e9aff555db7b6816076121ac3feebc3006de9ad