[RFC PATCH v2 1/6] i2c: use DEFINE for the dummy driver name

From: Wolfram Sang
Date: Wed Mar 18 2020 - 11:01:30 EST


We use it in multiple places, so make sure it is consistent whenever we
need to change it.

Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
---
drivers/i2c/i2c-core-base.c | 8 ++++----
drivers/i2c/i2c-core.h | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index cefad0881942..3d7b8a00a7d9 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -853,7 +853,7 @@ EXPORT_SYMBOL_GPL(i2c_unregister_device);


static const struct i2c_device_id dummy_id[] = {
- { "dummy", 0 },
+ { I2C_DUMMY_DRV_NAME, 0 },
{ },
};

@@ -869,7 +869,7 @@ static int dummy_remove(struct i2c_client *client)
}

static struct i2c_driver dummy_driver = {
- .driver.name = "dummy",
+ .driver.name = I2C_DUMMY_DRV_NAME,
.probe = dummy_probe,
.remove = dummy_remove,
.id_table = dummy_id,
@@ -896,7 +896,7 @@ static struct i2c_driver dummy_driver = {
struct i2c_client *i2c_new_dummy_device(struct i2c_adapter *adapter, u16 address)
{
struct i2c_board_info info = {
- I2C_BOARD_INFO("dummy", address),
+ I2C_BOARD_INFO(I2C_DUMMY_DRV_NAME, address),
};

return i2c_new_client_device(adapter, &info);
@@ -1487,7 +1487,7 @@ static void i2c_do_del_adapter(struct i2c_driver *driver,
static int __unregister_client(struct device *dev, void *dummy)
{
struct i2c_client *client = i2c_verify_client(dev);
- if (client && strcmp(client->name, "dummy"))
+ if (client && strcmp(client->name, I2C_DUMMY_DRV_NAME))
i2c_unregister_device(client);
return 0;
}
diff --git a/drivers/i2c/i2c-core.h b/drivers/i2c/i2c-core.h
index 517d98be68d2..fb89fabf84d3 100644
--- a/drivers/i2c/i2c-core.h
+++ b/drivers/i2c/i2c-core.h
@@ -22,6 +22,8 @@ int i2c_check_7bit_addr_validity_strict(unsigned short addr);
int i2c_dev_irq_from_resources(const struct resource *resources,
unsigned int num_resources);

+#define I2C_DUMMY_DRV_NAME "dummy"
+
/*
* We only allow atomic transfers for very late communication, e.g. to send
* the powerdown command to a PMIC. Atomic transfers are a corner case and not
--
2.20.1