Message ID | 20230902174547.71316-1-biju.das.jz@bp.renesas.com |
---|---|
State | New |
Headers | show |
Series | eeprom: at24: Drop at24_get_chip_data() | expand |
On Sat, Sep 2, 2023 at 7:45 PM Biju Das <biju.das.jz@bp.renesas.com> wrote: > > Replace at24_get_chip_data()->i2c_get_match_data() as it is > redundant. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > --- > drivers/misc/eeprom/at24.c | 32 +++----------------------------- > 1 file changed, 3 insertions(+), 29 deletions(-) > > diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c > index dbbf7db4ff2f..af83aca452b7 100644 > --- a/drivers/misc/eeprom/at24.c > +++ b/drivers/misc/eeprom/at24.c > @@ -509,32 +509,6 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count) > return 0; > } > > -static const struct at24_chip_data *at24_get_chip_data(struct device *dev) > -{ > - struct device_node *of_node = dev->of_node; > - const struct at24_chip_data *cdata; > - const struct i2c_device_id *id; > - > - id = i2c_match_id(at24_ids, to_i2c_client(dev)); > - > - /* > - * The I2C core allows OF nodes compatibles to match against the > - * I2C device ID table as a fallback, so check not only if an OF > - * node is present but also if it matches an OF device ID entry. > - */ > - if (of_node && of_match_device(at24_of_match, dev)) > - cdata = of_device_get_match_data(dev); > - else if (id) > - cdata = (void *)id->driver_data; > - else > - cdata = acpi_device_get_match_data(dev); > - > - if (!cdata) > - return ERR_PTR(-ENODEV); > - > - return cdata; > -} > - > static int at24_make_dummy_client(struct at24_data *at24, unsigned int index, > struct i2c_client *base_client, > struct regmap_config *regmap_config) > @@ -601,9 +575,9 @@ static int at24_probe(struct i2c_client *client) > i2c_fn_block = i2c_check_functionality(client->adapter, > I2C_FUNC_SMBUS_WRITE_I2C_BLOCK); > > - cdata = at24_get_chip_data(dev); > - if (IS_ERR(cdata)) > - return PTR_ERR(cdata); > + cdata = i2c_get_match_data(client); > + if (!cdata) > + return -ENODEV; > > err = device_property_read_u32(dev, "pagesize", &page_size); > if (err) > -- > 2.25.1 > Applied, thanks! Bart
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index dbbf7db4ff2f..af83aca452b7 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -509,32 +509,6 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count) return 0; } -static const struct at24_chip_data *at24_get_chip_data(struct device *dev) -{ - struct device_node *of_node = dev->of_node; - const struct at24_chip_data *cdata; - const struct i2c_device_id *id; - - id = i2c_match_id(at24_ids, to_i2c_client(dev)); - - /* - * The I2C core allows OF nodes compatibles to match against the - * I2C device ID table as a fallback, so check not only if an OF - * node is present but also if it matches an OF device ID entry. - */ - if (of_node && of_match_device(at24_of_match, dev)) - cdata = of_device_get_match_data(dev); - else if (id) - cdata = (void *)id->driver_data; - else - cdata = acpi_device_get_match_data(dev); - - if (!cdata) - return ERR_PTR(-ENODEV); - - return cdata; -} - static int at24_make_dummy_client(struct at24_data *at24, unsigned int index, struct i2c_client *base_client, struct regmap_config *regmap_config) @@ -601,9 +575,9 @@ static int at24_probe(struct i2c_client *client) i2c_fn_block = i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WRITE_I2C_BLOCK); - cdata = at24_get_chip_data(dev); - if (IS_ERR(cdata)) - return PTR_ERR(cdata); + cdata = i2c_get_match_data(client); + if (!cdata) + return -ENODEV; err = device_property_read_u32(dev, "pagesize", &page_size); if (err)
Replace at24_get_chip_data()->i2c_get_match_data() as it is redundant. Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- drivers/misc/eeprom/at24.c | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-)