| Message ID | 20230525210837.735447-1-u.kleine-koenig@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
| Series | watchdog: ziirave_wdt: Switch i2c driver back to use .probe() | expand |
Hello, On Fri, May 26, 2023 at 09:55:20AM -0700, Guenter Roeck wrote: > On Thu, May 25, 2023 at 11:08:37PM +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 > > 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> > > Reviewed-by: Guenter Roeck <linux@roeck-us.net> I assume this is a nice start to get this applied for the next merge window. The patch didn't show up in next yet though. Is that because Wim didn't start applying patches yet, or is there a problem (like this patch being lost in Wim's mailbox)? Best regards Uwe
On 6/11/23 04:13, Uwe Kleine-König wrote: > Hello, > > On Fri, May 26, 2023 at 09:55:20AM -0700, Guenter Roeck wrote: >> On Thu, May 25, 2023 at 11:08:37PM +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 >>> 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> >> >> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > > I assume this is a nice start to get this applied for the next merge > window. The patch didn't show up in next yet though. Is that because Wim > didn't start applying patches yet, or is there a problem (like this > patch being lost in Wim's mailbox)? > lack of time on my side, and Wim typically picks up patches quite late into his branch. Guenter
diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c index 21ca08a694ee..5ed33df68e9a 100644 --- a/drivers/watchdog/ziirave_wdt.c +++ b/drivers/watchdog/ziirave_wdt.c @@ -731,7 +731,7 @@ static struct i2c_driver ziirave_wdt_driver = { .name = "ziirave_wdt", .of_match_table = zrv_wdt_of_match, }, - .probe_new = ziirave_wdt_probe, + .probe = ziirave_wdt_probe, .remove = ziirave_wdt_remove, .id_table = ziirave_wdt_id, };
After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then 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/watchdog/ziirave_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: ac9a78681b921877518763ba0e89202254349d1b