| Message ID | 20220628193906.36350-2-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 669f5618feb8b4847f3a64d541cfae22e999a91a |
| Headers | show |
| Series | None | expand |
On Tue, Jun 28, 2022 at 9:39 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > It's wrong to use defined string literal for three semantically different > cases, i.e.: > 1) compatible string, which is part of ABI and has to have specific format; > 2) I2C ID, which is user space visible and also ABI; > 3) driver name, that can be changed. > > Drop the define and use appropriate string literals in place. > > While at it, drop comma at terminator entry of OF ID table. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
diff --git a/drivers/gpio/gpio-adp5588.c b/drivers/gpio/gpio-adp5588.c index 51ed23ba4645..d6a229a67044 100644 --- a/drivers/gpio/gpio-adp5588.c +++ b/drivers/gpio/gpio-adp5588.c @@ -18,8 +18,6 @@ #include <linux/platform_data/adp5588.h> -#define DRV_NAME "adp5588-gpio" - /* * Early pre 4.0 Silicon required to delay readout by at least 25ms, * since the Event Counter Register updated 25ms after the interrupt @@ -422,20 +420,20 @@ static int adp5588_gpio_remove(struct i2c_client *client) } static const struct i2c_device_id adp5588_gpio_id[] = { - {DRV_NAME, 0}, + { "adp5588-gpio" }, {} }; MODULE_DEVICE_TABLE(i2c, adp5588_gpio_id); static const struct of_device_id adp5588_gpio_of_id[] = { - { .compatible = "adi," DRV_NAME, }, - {}, + { .compatible = "adi,adp5588-gpio" }, + {} }; MODULE_DEVICE_TABLE(of, adp5588_gpio_of_id); static struct i2c_driver adp5588_gpio_driver = { .driver = { - .name = DRV_NAME, + .name = "adp5588-gpio", .of_match_table = adp5588_gpio_of_id, }, .probe_new = adp5588_gpio_probe,
It's wrong to use defined string literal for three semantically different cases, i.e.: 1) compatible string, which is part of ABI and has to have specific format; 2) I2C ID, which is user space visible and also ABI; 3) driver name, that can be changed. Drop the define and use appropriate string literals in place. While at it, drop comma at terminator entry of OF ID table. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/gpio/gpio-adp5588.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)