| Message ID | 20230515175042.495377-1-afd@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/2] i2c: davinci: Use platform table macro over module_alias | expand |
Hi Andrew, On Mon, May 15, 2023 at 12:50:41PM -0500, Andrew Davis wrote: > Generates the same platform module alias. More standard usage. > > Signed-off-by: Andrew Davis <afd@ti.com> Could you kindly rebase this to my i2c/for-mergewindow branch? It seems it conflicts with the "callback returning void" conversion. Thanks, Wolfram
On Wed, Jun 07, 2023 at 11:32:38AM +0200, Wolfram Sang wrote: > Hi Andrew, > > On Mon, May 15, 2023 at 12:50:41PM -0500, Andrew Davis wrote: > > Generates the same platform module alias. More standard usage. > > > > Signed-off-by: Andrew Davis <afd@ti.com> > > Could you kindly rebase this to my i2c/for-mergewindow branch? It seems > it conflicts with the "callback returning void" conversion. I did this now and applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 9750310f2c96..c55bd937def7 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -940,12 +940,16 @@ static const struct dev_pm_ops davinci_i2c_pm = { #define davinci_i2c_pm_ops NULL #endif -/* work with hotplug and coldplug */ -MODULE_ALIAS("platform:i2c_davinci"); +static const struct platform_device_id davinci_i2c_driver_ids[] = { + { .name = "i2c_davinci", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(platform, davinci_i2c_driver_ids); static struct platform_driver davinci_i2c_driver = { .probe = davinci_i2c_probe, .remove = davinci_i2c_remove, + .id_table = davinci_i2c_driver_ids, .driver = { .name = "i2c_davinci", .pm = davinci_i2c_pm_ops,
Generates the same platform module alias. More standard usage. Signed-off-by: Andrew Davis <afd@ti.com> --- drivers/i2c/busses/i2c-davinci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)