On Tue, Dec 03, 2024 at 10:57:59AM +0100, Geert Uytterhoeven wrote:
> On Thu, 10 Oct 2024, Uwe Kleine-König wrote:
> > After commit 0edb555a65d1 ("platform: Make platform_driver::remove()
> > return void") .remove() is (again) the right callback to implement for
> > platform drivers.
> >
> > Convert all platform drivers below drivers/watchdog/ to use .remove(),
> > with the eventual goal to drop struct platform_driver::remove_new(). As
> > .remove() and .remove_new() have the same prototypes, conversion is done
> > by just changing the structure member name in the driver initializer.
> >
> > While touching these files, make indention of the struct initializer
> > consistent in several files.
> >
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxx>
>
> Thanks for your patch, which is now commit 562b0b03193b567c ("watchdog:
> Switch back to struct platform_driver::remove()") in watchdog/master.
> Note that this now conflicts with commit e70140ba0d2b1a30 ("Get rid of
> 'remove_new' relic from platform driver struct") upstream.
> Resolution: just take the version from upstream.
The conflicting file is drivers/watchdog/sa1100_wdt.c. Linus's variant
looks as follows:
static struct platform_driver sa1100dog_driver = {
.driver.name = "sa1100_wdt",
.probe = sa1100dog_probe,
.remove = sa1100dog_remove,
};
Mine is:
static struct platform_driver sa1100dog_driver = {
.driver.name = "sa1100_wdt",
.probe = sa1100dog_probe,
.remove = sa1100dog_remove,
};
The difference is only whitespace and my variant is the (obviously?)
better variant. So I agree to everything what Geert said apart from
"Resolution: just take the version from upstream."
Best regards
Uwe
Attachment:
signature.asc
Description: PGP signature
