Message ID | 20240401030052.2887845-2-tzungbi@kernel.org |
---|---|
State | New |
Headers | show |
Series | provide ID table for avoiding fallback match | expand |
On 01/04/2024 05:00, 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 > > Reviewed-by: Benson Leung <bleung@chromium.org> > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org> Looks OK, I'll queue this patch up for v6.10. Regards, Hans > --- > Changes from v1: > - No code changes. > - Add R-b tags. > > drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c > index 48ed2993d2f0..8fbbb4091455 100644 > --- a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c > +++ b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c > @@ -8,6 +8,7 @@ > > #include <linux/kernel.h> > #include <linux/module.h> > +#include <linux/mod_devicetable.h> > #include <linux/platform_device.h> > #include <linux/dmi.h> > #include <linux/pci.h> > @@ -573,6 +574,12 @@ static void cros_ec_cec_remove(struct platform_device *pdev) > } > } > > +static const struct platform_device_id cros_ec_cec_id[] = { > + { DRV_NAME, 0 }, > + {} > +}; > +MODULE_DEVICE_TABLE(platform, cros_ec_cec_id); > + > static struct platform_driver cros_ec_cec_driver = { > .probe = cros_ec_cec_probe, > .remove_new = cros_ec_cec_remove, > @@ -580,6 +587,7 @@ static struct platform_driver cros_ec_cec_driver = { > .name = DRV_NAME, > .pm = &cros_ec_cec_pm_ops, > }, > + .id_table = cros_ec_cec_id, > }; > > module_platform_driver(cros_ec_cec_driver); > @@ -587,4 +595,3 @@ module_platform_driver(cros_ec_cec_driver); > MODULE_DESCRIPTION("CEC driver for ChromeOS ECs"); > MODULE_AUTHOR("Neil Armstrong <narmstrong@baylibre.com>"); > MODULE_LICENSE("GPL"); > -MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c index 48ed2993d2f0..8fbbb4091455 100644 --- a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c +++ b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c @@ -8,6 +8,7 @@ #include <linux/kernel.h> #include <linux/module.h> +#include <linux/mod_devicetable.h> #include <linux/platform_device.h> #include <linux/dmi.h> #include <linux/pci.h> @@ -573,6 +574,12 @@ static void cros_ec_cec_remove(struct platform_device *pdev) } } +static const struct platform_device_id cros_ec_cec_id[] = { + { DRV_NAME, 0 }, + {} +}; +MODULE_DEVICE_TABLE(platform, cros_ec_cec_id); + static struct platform_driver cros_ec_cec_driver = { .probe = cros_ec_cec_probe, .remove_new = cros_ec_cec_remove, @@ -580,6 +587,7 @@ static struct platform_driver cros_ec_cec_driver = { .name = DRV_NAME, .pm = &cros_ec_cec_pm_ops, }, + .id_table = cros_ec_cec_id, }; module_platform_driver(cros_ec_cec_driver); @@ -587,4 +595,3 @@ module_platform_driver(cros_ec_cec_driver); MODULE_DESCRIPTION("CEC driver for ChromeOS ECs"); MODULE_AUTHOR("Neil Armstrong <narmstrong@baylibre.com>"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:" DRV_NAME);