| Message ID | 20241127091036.444330-2-u.kleine-koenig@baylibre.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | extcon: Switch back to struct platform_driver::remove() | expand |
On Wed, Nov 27, 2024 at 6:30 PM Uwe Kleine-König <u.kleine-koenig@baylibre.com> wrote: > > From: Uwe Kleine-König <ukleinek@kernel.org> > > 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/extcon 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. > > En passant make the alignment of the struct initializer in > extcon-usbc-cros-ec.c consistent. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> > --- > Hello, > > given the simplicity of the individual changes I do this all in a single > patch. I you don't agree, please tell and I will happily split it. > > It's based on today's next, feel free to drop changes that result in a > conflict when you come around to apply this. I'll care for the fallout > at a later time then. (Having said that, if you use b4 am -3 and git am > -3, there should be hardly any conflict.) > > Best regards > Uwe > > drivers/extcon/extcon-adc-jack.c | 2 +- > drivers/extcon/extcon-intel-cht-wc.c | 2 +- > drivers/extcon/extcon-intel-mrfld.c | 2 +- > drivers/extcon/extcon-max3355.c | 2 +- > drivers/extcon/extcon-max77843.c | 2 +- > drivers/extcon/extcon-rtk-type-c.c | 2 +- > drivers/extcon/extcon-usb-gpio.c | 2 +- > drivers/extcon/extcon-usbc-cros-ec.c | 6 +++--- > 8 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c > index 125016da7fde..46c40d85c2ac 100644 > --- a/drivers/extcon/extcon-adc-jack.c > +++ b/drivers/extcon/extcon-adc-jack.c > @@ -196,7 +196,7 @@ static SIMPLE_DEV_PM_OPS(adc_jack_pm_ops, > > static struct platform_driver adc_jack_driver = { > .probe = adc_jack_probe, > - .remove_new = adc_jack_remove, > + .remove = adc_jack_remove, > .driver = { > .name = "adc-jack", > .pm = &adc_jack_pm_ops, > diff --git a/drivers/extcon/extcon-intel-cht-wc.c b/drivers/extcon/extcon-intel-cht-wc.c > index 93552dc3c895..8131a3d7d562 100644 > --- a/drivers/extcon/extcon-intel-cht-wc.c > +++ b/drivers/extcon/extcon-intel-cht-wc.c > @@ -627,7 +627,7 @@ MODULE_DEVICE_TABLE(platform, cht_wc_extcon_table); > > static struct platform_driver cht_wc_extcon_driver = { > .probe = cht_wc_extcon_probe, > - .remove_new = cht_wc_extcon_remove, > + .remove = cht_wc_extcon_remove, > .id_table = cht_wc_extcon_table, > .driver = { > .name = "cht_wcove_pwrsrc", > diff --git a/drivers/extcon/extcon-intel-mrfld.c b/drivers/extcon/extcon-intel-mrfld.c > index a1f737f13d49..9219f4328d70 100644 > --- a/drivers/extcon/extcon-intel-mrfld.c > +++ b/drivers/extcon/extcon-intel-mrfld.c > @@ -275,7 +275,7 @@ static struct platform_driver mrfld_extcon_driver = { > .name = "mrfld_bcove_pwrsrc", > }, > .probe = mrfld_extcon_probe, > - .remove_new = mrfld_extcon_remove, > + .remove = mrfld_extcon_remove, > .id_table = mrfld_extcon_id_table, > }; > module_platform_driver(mrfld_extcon_driver); > diff --git a/drivers/extcon/extcon-max3355.c b/drivers/extcon/extcon-max3355.c > index e62ce7a8d131..b2ee4ff8b04d 100644 > --- a/drivers/extcon/extcon-max3355.c > +++ b/drivers/extcon/extcon-max3355.c > @@ -127,7 +127,7 @@ MODULE_DEVICE_TABLE(of, max3355_match_table); > > static struct platform_driver max3355_driver = { > .probe = max3355_probe, > - .remove_new = max3355_remove, > + .remove = max3355_remove, > .driver = { > .name = "extcon-max3355", > .of_match_table = max3355_match_table, > diff --git a/drivers/extcon/extcon-max77843.c b/drivers/extcon/extcon-max77843.c > index 9849e3b8327e..2ae9f7f1a67f 100644 > --- a/drivers/extcon/extcon-max77843.c > +++ b/drivers/extcon/extcon-max77843.c > @@ -956,7 +956,7 @@ static struct platform_driver max77843_muic_driver = { > .of_match_table = of_max77843_muic_dt_match, > }, > .probe = max77843_muic_probe, > - .remove_new = max77843_muic_remove, > + .remove = max77843_muic_remove, > .id_table = max77843_muic_id, > }; > > diff --git a/drivers/extcon/extcon-rtk-type-c.c b/drivers/extcon/extcon-rtk-type-c.c > index 19a01e663733..bdc2b7b3a246 100644 > --- a/drivers/extcon/extcon-rtk-type-c.c > +++ b/drivers/extcon/extcon-rtk-type-c.c > @@ -1778,7 +1778,7 @@ static const struct dev_pm_ops extcon_rtk_type_c_pm_ops = { > > static struct platform_driver extcon_rtk_type_c_driver = { > .probe = extcon_rtk_type_c_probe, > - .remove_new = extcon_rtk_type_c_remove, > + .remove = extcon_rtk_type_c_remove, > .driver = { > .name = "extcon-rtk-type_c", > .of_match_table = extcon_rtk_type_c_match, > diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c > index 9b61eb99b7dc..5e8ad21ad206 100644 > --- a/drivers/extcon/extcon-usb-gpio.c > +++ b/drivers/extcon/extcon-usb-gpio.c > @@ -279,7 +279,7 @@ MODULE_DEVICE_TABLE(platform, usb_extcon_platform_ids); > > static struct platform_driver usb_extcon_driver = { > .probe = usb_extcon_probe, > - .remove_new = usb_extcon_remove, > + .remove = usb_extcon_remove, > .driver = { > .name = "extcon-usb-gpio", > .pm = &usb_extcon_pm_ops, > diff --git a/drivers/extcon/extcon-usbc-cros-ec.c b/drivers/extcon/extcon-usbc-cros-ec.c > index 805a47230689..529ac5898e38 100644 > --- a/drivers/extcon/extcon-usbc-cros-ec.c > +++ b/drivers/extcon/extcon-usbc-cros-ec.c > @@ -525,12 +525,12 @@ MODULE_DEVICE_TABLE(of, extcon_cros_ec_of_match); > > static struct platform_driver extcon_cros_ec_driver = { > .driver = { > - .name = "extcon-usbc-cros-ec", > + .name = "extcon-usbc-cros-ec", If there is no change, this line is changed. Please don't touch this line. > .of_match_table = of_match_ptr(extcon_cros_ec_of_match), > .pm = DEV_PM_OPS, > }, > - .remove_new = extcon_cros_ec_remove, > - .probe = extcon_cros_ec_probe, > + .remove = extcon_cros_ec_remove, > + .probe = extcon_cros_ec_probe, If there is no change on probe, this line is changed. Please don't touch this line. (snip) If you fix the above comment, it looks good to me. Best Regards, Chanwoo Choi Samsung Electronics
Hello, On Sun, Dec 08, 2024 at 09:49:16PM +0900, Chanwoo Choi wrote: > On Wed, Nov 27, 2024 at 6:30 PM Uwe Kleine-König > <u.kleine-koenig@baylibre.com> wrote: > > diff --git a/drivers/extcon/extcon-usbc-cros-ec.c b/drivers/extcon/extcon-usbc-cros-ec.c > > index 805a47230689..529ac5898e38 100644 > > --- a/drivers/extcon/extcon-usbc-cros-ec.c > > +++ b/drivers/extcon/extcon-usbc-cros-ec.c > > @@ -525,12 +525,12 @@ MODULE_DEVICE_TABLE(of, extcon_cros_ec_of_match); > > > > static struct platform_driver extcon_cros_ec_driver = { > > .driver = { > > - .name = "extcon-usbc-cros-ec", > > + .name = "extcon-usbc-cros-ec", > > If there is no change, this line is changed. > Please don't touch this line. I'm not 100% sure I understand what you say here. I guess you oppose to fix the coding style as a side product of my patch. Note that it's probably easiest to just not apply my patch as Linus Torvalds fixed all .remove_new in his tree generating conflicts if subsystems take similar patches. Best regards Uwe
diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c index 125016da7fde..46c40d85c2ac 100644 --- a/drivers/extcon/extcon-adc-jack.c +++ b/drivers/extcon/extcon-adc-jack.c @@ -196,7 +196,7 @@ static SIMPLE_DEV_PM_OPS(adc_jack_pm_ops, static struct platform_driver adc_jack_driver = { .probe = adc_jack_probe, - .remove_new = adc_jack_remove, + .remove = adc_jack_remove, .driver = { .name = "adc-jack", .pm = &adc_jack_pm_ops, diff --git a/drivers/extcon/extcon-intel-cht-wc.c b/drivers/extcon/extcon-intel-cht-wc.c index 93552dc3c895..8131a3d7d562 100644 --- a/drivers/extcon/extcon-intel-cht-wc.c +++ b/drivers/extcon/extcon-intel-cht-wc.c @@ -627,7 +627,7 @@ MODULE_DEVICE_TABLE(platform, cht_wc_extcon_table); static struct platform_driver cht_wc_extcon_driver = { .probe = cht_wc_extcon_probe, - .remove_new = cht_wc_extcon_remove, + .remove = cht_wc_extcon_remove, .id_table = cht_wc_extcon_table, .driver = { .name = "cht_wcove_pwrsrc", diff --git a/drivers/extcon/extcon-intel-mrfld.c b/drivers/extcon/extcon-intel-mrfld.c index a1f737f13d49..9219f4328d70 100644 --- a/drivers/extcon/extcon-intel-mrfld.c +++ b/drivers/extcon/extcon-intel-mrfld.c @@ -275,7 +275,7 @@ static struct platform_driver mrfld_extcon_driver = { .name = "mrfld_bcove_pwrsrc", }, .probe = mrfld_extcon_probe, - .remove_new = mrfld_extcon_remove, + .remove = mrfld_extcon_remove, .id_table = mrfld_extcon_id_table, }; module_platform_driver(mrfld_extcon_driver); diff --git a/drivers/extcon/extcon-max3355.c b/drivers/extcon/extcon-max3355.c index e62ce7a8d131..b2ee4ff8b04d 100644 --- a/drivers/extcon/extcon-max3355.c +++ b/drivers/extcon/extcon-max3355.c @@ -127,7 +127,7 @@ MODULE_DEVICE_TABLE(of, max3355_match_table); static struct platform_driver max3355_driver = { .probe = max3355_probe, - .remove_new = max3355_remove, + .remove = max3355_remove, .driver = { .name = "extcon-max3355", .of_match_table = max3355_match_table, diff --git a/drivers/extcon/extcon-max77843.c b/drivers/extcon/extcon-max77843.c index 9849e3b8327e..2ae9f7f1a67f 100644 --- a/drivers/extcon/extcon-max77843.c +++ b/drivers/extcon/extcon-max77843.c @@ -956,7 +956,7 @@ static struct platform_driver max77843_muic_driver = { .of_match_table = of_max77843_muic_dt_match, }, .probe = max77843_muic_probe, - .remove_new = max77843_muic_remove, + .remove = max77843_muic_remove, .id_table = max77843_muic_id, }; diff --git a/drivers/extcon/extcon-rtk-type-c.c b/drivers/extcon/extcon-rtk-type-c.c index 19a01e663733..bdc2b7b3a246 100644 --- a/drivers/extcon/extcon-rtk-type-c.c +++ b/drivers/extcon/extcon-rtk-type-c.c @@ -1778,7 +1778,7 @@ static const struct dev_pm_ops extcon_rtk_type_c_pm_ops = { static struct platform_driver extcon_rtk_type_c_driver = { .probe = extcon_rtk_type_c_probe, - .remove_new = extcon_rtk_type_c_remove, + .remove = extcon_rtk_type_c_remove, .driver = { .name = "extcon-rtk-type_c", .of_match_table = extcon_rtk_type_c_match, diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c index 9b61eb99b7dc..5e8ad21ad206 100644 --- a/drivers/extcon/extcon-usb-gpio.c +++ b/drivers/extcon/extcon-usb-gpio.c @@ -279,7 +279,7 @@ MODULE_DEVICE_TABLE(platform, usb_extcon_platform_ids); static struct platform_driver usb_extcon_driver = { .probe = usb_extcon_probe, - .remove_new = usb_extcon_remove, + .remove = usb_extcon_remove, .driver = { .name = "extcon-usb-gpio", .pm = &usb_extcon_pm_ops, diff --git a/drivers/extcon/extcon-usbc-cros-ec.c b/drivers/extcon/extcon-usbc-cros-ec.c index 805a47230689..529ac5898e38 100644 --- a/drivers/extcon/extcon-usbc-cros-ec.c +++ b/drivers/extcon/extcon-usbc-cros-ec.c @@ -525,12 +525,12 @@ MODULE_DEVICE_TABLE(of, extcon_cros_ec_of_match); static struct platform_driver extcon_cros_ec_driver = { .driver = { - .name = "extcon-usbc-cros-ec", + .name = "extcon-usbc-cros-ec", .of_match_table = of_match_ptr(extcon_cros_ec_of_match), .pm = DEV_PM_OPS, }, - .remove_new = extcon_cros_ec_remove, - .probe = extcon_cros_ec_probe, + .remove = extcon_cros_ec_remove, + .probe = extcon_cros_ec_probe, }; module_platform_driver(extcon_cros_ec_driver);