| Message ID | 20240329075630.2069474-12-tzungbi@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | platform/chrome: provide ID table for avoiding fallback match | expand |
On Fri, Mar 29, 2024 at 03:56:23PM +0800, Tzung-Bi Shih wrote: > Instead of using fallback driver name match, provide ID table[1] for the > primary match. > > [1]: https://elixir.bootlin.com/linux/v6.8/source/drivers/base/platform.c#L1353 > > Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org> Reviewed-by: Benson Leung <bleung@chromium.org> > --- > drivers/power/supply/cros_peripheral_charger.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/power/supply/cros_peripheral_charger.c b/drivers/power/supply/cros_peripheral_charger.c > index a204f2355be4..d406f2a78449 100644 > --- a/drivers/power/supply/cros_peripheral_charger.c > +++ b/drivers/power/supply/cros_peripheral_charger.c > @@ -5,6 +5,7 @@ > * Copyright 2020 Google LLC. > */ > > +#include <linux/mod_devicetable.h> > #include <linux/module.h> > #include <linux/notifier.h> > #include <linux/platform_data/cros_ec_commands.h> > @@ -367,16 +368,22 @@ static int __maybe_unused cros_pchg_resume(struct device *dev) > > static SIMPLE_DEV_PM_OPS(cros_pchg_pm_ops, NULL, cros_pchg_resume); > > +static const struct platform_device_id cros_pchg_id[] = { > + { DRV_NAME, 0 }, > + {} > +}; > +MODULE_DEVICE_TABLE(platform, cros_pchg_id); > + > static struct platform_driver cros_pchg_driver = { > .driver = { > .name = DRV_NAME, > .pm = &cros_pchg_pm_ops, > }, > - .probe = cros_pchg_probe > + .probe = cros_pchg_probe, > + .id_table = cros_pchg_id, > }; > > module_platform_driver(cros_pchg_driver); > > MODULE_LICENSE("GPL"); > MODULE_DESCRIPTION("ChromeOS EC peripheral device charger"); > -MODULE_ALIAS("platform:" DRV_NAME); > -- > 2.44.0.478.gd926399ef9-goog >
diff --git a/drivers/power/supply/cros_peripheral_charger.c b/drivers/power/supply/cros_peripheral_charger.c index a204f2355be4..d406f2a78449 100644 --- a/drivers/power/supply/cros_peripheral_charger.c +++ b/drivers/power/supply/cros_peripheral_charger.c @@ -5,6 +5,7 @@ * Copyright 2020 Google LLC. */ +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/notifier.h> #include <linux/platform_data/cros_ec_commands.h> @@ -367,16 +368,22 @@ static int __maybe_unused cros_pchg_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(cros_pchg_pm_ops, NULL, cros_pchg_resume); +static const struct platform_device_id cros_pchg_id[] = { + { DRV_NAME, 0 }, + {} +}; +MODULE_DEVICE_TABLE(platform, cros_pchg_id); + static struct platform_driver cros_pchg_driver = { .driver = { .name = DRV_NAME, .pm = &cros_pchg_pm_ops, }, - .probe = cros_pchg_probe + .probe = cros_pchg_probe, + .id_table = cros_pchg_id, }; module_platform_driver(cros_pchg_driver); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("ChromeOS EC peripheral device charger"); -MODULE_ALIAS("platform:" DRV_NAME);
Instead of using fallback driver name match, provide ID table[1] for the primary match. [1]: https://elixir.bootlin.com/linux/v6.8/source/drivers/base/platform.c#L1353 Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org> --- drivers/power/supply/cros_peripheral_charger.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)