| Message ID | 20210928092242.30036-4-zev@bewilderbeest.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | hwmon: (pmbus/lm25066) Configurable sense resistor, other cleanups | expand |
On Tue, Sep 28, 2021 at 02:22:37AM -0700, Zev Weiss wrote: > Reordering things to put the table before the probe function > eliminates the need for it. > > Signed-off-by: Zev Weiss <zev@bewilderbeest.net> Applied. Thanks, Guenter > --- > drivers/hwmon/pmbus/lm25066.c | 23 ++++++++++------------- > 1 file changed, 10 insertions(+), 13 deletions(-) > > diff --git a/drivers/hwmon/pmbus/lm25066.c b/drivers/hwmon/pmbus/lm25066.c > index 3616705aafde..4dc003ff859e 100644 > --- a/drivers/hwmon/pmbus/lm25066.c > +++ b/drivers/hwmon/pmbus/lm25066.c > @@ -234,8 +234,6 @@ struct lm25066_data { > > #define to_lm25066_data(x) container_of(x, struct lm25066_data, info) > > -static const struct i2c_device_id lm25066_id[]; > - > static int lm25066_read_word_data(struct i2c_client *client, int page, > int phase, int reg) > { > @@ -436,6 +434,16 @@ static int lm25066_write_word_data(struct i2c_client *client, int page, int reg, > return ret; > } > > +static const struct i2c_device_id lm25066_id[] = { > + {"lm25056", lm25056}, > + {"lm25066", lm25066}, > + {"lm5064", lm5064}, > + {"lm5066", lm5066}, > + {"lm5066i", lm5066i}, > + { } > +}; > +MODULE_DEVICE_TABLE(i2c, lm25066_id); > + > static int lm25066_probe(struct i2c_client *client) > { > int config; > @@ -509,17 +517,6 @@ static int lm25066_probe(struct i2c_client *client) > return pmbus_do_probe(client, info); > } > > -static const struct i2c_device_id lm25066_id[] = { > - {"lm25056", lm25056}, > - {"lm25066", lm25066}, > - {"lm5064", lm5064}, > - {"lm5066", lm5066}, > - {"lm5066i", lm5066i}, > - { } > -}; > - > -MODULE_DEVICE_TABLE(i2c, lm25066_id); > - > /* This is the driver that will be inserted */ > static struct i2c_driver lm25066_driver = { > .driver = {
diff --git a/drivers/hwmon/pmbus/lm25066.c b/drivers/hwmon/pmbus/lm25066.c index 3616705aafde..4dc003ff859e 100644 --- a/drivers/hwmon/pmbus/lm25066.c +++ b/drivers/hwmon/pmbus/lm25066.c @@ -234,8 +234,6 @@ struct lm25066_data { #define to_lm25066_data(x) container_of(x, struct lm25066_data, info) -static const struct i2c_device_id lm25066_id[]; - static int lm25066_read_word_data(struct i2c_client *client, int page, int phase, int reg) { @@ -436,6 +434,16 @@ static int lm25066_write_word_data(struct i2c_client *client, int page, int reg, return ret; } +static const struct i2c_device_id lm25066_id[] = { + {"lm25056", lm25056}, + {"lm25066", lm25066}, + {"lm5064", lm5064}, + {"lm5066", lm5066}, + {"lm5066i", lm5066i}, + { } +}; +MODULE_DEVICE_TABLE(i2c, lm25066_id); + static int lm25066_probe(struct i2c_client *client) { int config; @@ -509,17 +517,6 @@ static int lm25066_probe(struct i2c_client *client) return pmbus_do_probe(client, info); } -static const struct i2c_device_id lm25066_id[] = { - {"lm25056", lm25056}, - {"lm25066", lm25066}, - {"lm5064", lm5064}, - {"lm5066", lm5066}, - {"lm5066i", lm5066i}, - { } -}; - -MODULE_DEVICE_TABLE(i2c, lm25066_id); - /* This is the driver that will be inserted */ static struct i2c_driver lm25066_driver = { .driver = {
Reordering things to put the table before the probe function eliminates the need for it. Signed-off-by: Zev Weiss <zev@bewilderbeest.net> --- drivers/hwmon/pmbus/lm25066.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)