| Message ID | 20200318150059.21714-4-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | Under Review |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | i2c: of: reserve unknown and ancillary addresses | expand |
On Wed, 18 Mar 2020 16:00:56 +0100 Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > 'dev' is only used for printing an error message. However, that > information is not needed because '%pOF' fully describes the location of > the error. Drop the 'dev' and remove the superfluous parameter. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > --- > drivers/i2c/i2c-core-of.c | 7 +++---- > drivers/i3c/master.c | 2 +- > include/linux/i2c.h | 6 ++---- > 3 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c > index d8d111ad6c85..710704cd583e 100644 > --- a/drivers/i2c/i2c-core-of.c > +++ b/drivers/i2c/i2c-core-of.c > @@ -19,8 +19,7 @@ > > #include "i2c-core.h" > > -int of_i2c_get_board_info(struct device *dev, struct device_node *node, > - struct i2c_board_info *info) > +int of_i2c_get_board_info(struct device_node *node, struct i2c_board_info *info) > { > u32 addr; > int ret; > @@ -29,7 +28,7 @@ int of_i2c_get_board_info(struct device *dev, struct device_node *node, > > ret = of_property_read_u32(node, "reg", &addr); > if (ret) { > - dev_err(dev, "of_i2c: invalid reg on %pOF\n", node); > + pr_err("of_i2c: invalid reg on %pOF\n", node); > return ret; > } > > @@ -69,7 +68,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, > > dev_dbg(&adap->dev, "of_i2c: register %pOF\n", node); > > - ret = of_i2c_get_board_info(&adap->dev, node, &info); > + ret = of_i2c_get_board_info(node, &info); > if (ret) > return ERR_PTR(ret); > > diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c > index 7f8f896fa0c3..cc0549a9fc64 100644 > --- a/drivers/i3c/master.c > +++ b/drivers/i3c/master.c > @@ -1943,7 +1943,7 @@ of_i3c_master_add_i2c_boardinfo(struct i3c_master_controller *master, > if (!boardinfo) > return -ENOMEM; > > - ret = of_i2c_get_board_info(dev, node, &boardinfo->base); > + ret = of_i2c_get_board_info(node, &boardinfo->base); > if (ret) > return ret; > > diff --git a/include/linux/i2c.h b/include/linux/i2c.h > index f834687989f7..d84aaf0d83d5 100644 > --- a/include/linux/i2c.h > +++ b/include/linux/i2c.h > @@ -942,8 +942,7 @@ const struct of_device_id > *i2c_of_match_device(const struct of_device_id *matches, > struct i2c_client *client); > > -int of_i2c_get_board_info(struct device *dev, struct device_node *node, > - struct i2c_board_info *info); > +int of_i2c_get_board_info(struct device_node *node, struct i2c_board_info *info); > > #else > > @@ -969,8 +968,7 @@ static inline const struct of_device_id > return NULL; > } > > -static inline int of_i2c_get_board_info(struct device *dev, > - struct device_node *node, > +static inline int of_i2c_get_board_info(struct device_node *node, > struct i2c_board_info *info) > { > return -ENOTSUPP;
Hi Wolfram, On 18/03/2020 15:00, Wolfram Sang wrote: > 'dev' is only used for printing an error message. However, that > information is not needed because '%pOF' fully describes the location of > the error. Drop the 'dev' and remove the superfluous parameter. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > --- > drivers/i2c/i2c-core-of.c | 7 +++---- > drivers/i3c/master.c | 2 +- > include/linux/i2c.h | 6 ++---- > 3 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c > index d8d111ad6c85..710704cd583e 100644 > --- a/drivers/i2c/i2c-core-of.c > +++ b/drivers/i2c/i2c-core-of.c > @@ -19,8 +19,7 @@ > > #include "i2c-core.h" > > -int of_i2c_get_board_info(struct device *dev, struct device_node *node, > - struct i2c_board_info *info) > +int of_i2c_get_board_info(struct device_node *node, struct i2c_board_info *info) > { > u32 addr; > int ret; > @@ -29,7 +28,7 @@ int of_i2c_get_board_info(struct device *dev, struct device_node *node, > > ret = of_property_read_u32(node, "reg", &addr); > if (ret) { > - dev_err(dev, "of_i2c: invalid reg on %pOF\n", node); > + pr_err("of_i2c: invalid reg on %pOF\n", node); > return ret; > } > > @@ -69,7 +68,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, > > dev_dbg(&adap->dev, "of_i2c: register %pOF\n", node); > > - ret = of_i2c_get_board_info(&adap->dev, node, &info); > + ret = of_i2c_get_board_info(node, &info); > if (ret) > return ERR_PTR(ret); > > diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c > index 7f8f896fa0c3..cc0549a9fc64 100644 > --- a/drivers/i3c/master.c > +++ b/drivers/i3c/master.c > @@ -1943,7 +1943,7 @@ of_i3c_master_add_i2c_boardinfo(struct i3c_master_controller *master, > if (!boardinfo) > return -ENOMEM; > > - ret = of_i2c_get_board_info(dev, node, &boardinfo->base); > + ret = of_i2c_get_board_info(node, &boardinfo->base); > if (ret) > return ret; > > diff --git a/include/linux/i2c.h b/include/linux/i2c.h > index f834687989f7..d84aaf0d83d5 100644 > --- a/include/linux/i2c.h > +++ b/include/linux/i2c.h > @@ -942,8 +942,7 @@ const struct of_device_id > *i2c_of_match_device(const struct of_device_id *matches, > struct i2c_client *client); > > -int of_i2c_get_board_info(struct device *dev, struct device_node *node, > - struct i2c_board_info *info); > +int of_i2c_get_board_info(struct device_node *node, struct i2c_board_info *info); > > #else > > @@ -969,8 +968,7 @@ static inline const struct of_device_id > return NULL; > } > > -static inline int of_i2c_get_board_info(struct device *dev, > - struct device_node *node, > +static inline int of_i2c_get_board_info(struct device_node *node, > struct i2c_board_info *info) > { > return -ENOTSUPP; >
diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c index d8d111ad6c85..710704cd583e 100644 --- a/drivers/i2c/i2c-core-of.c +++ b/drivers/i2c/i2c-core-of.c @@ -19,8 +19,7 @@ #include "i2c-core.h" -int of_i2c_get_board_info(struct device *dev, struct device_node *node, - struct i2c_board_info *info) +int of_i2c_get_board_info(struct device_node *node, struct i2c_board_info *info) { u32 addr; int ret; @@ -29,7 +28,7 @@ int of_i2c_get_board_info(struct device *dev, struct device_node *node, ret = of_property_read_u32(node, "reg", &addr); if (ret) { - dev_err(dev, "of_i2c: invalid reg on %pOF\n", node); + pr_err("of_i2c: invalid reg on %pOF\n", node); return ret; } @@ -69,7 +68,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, dev_dbg(&adap->dev, "of_i2c: register %pOF\n", node); - ret = of_i2c_get_board_info(&adap->dev, node, &info); + ret = of_i2c_get_board_info(node, &info); if (ret) return ERR_PTR(ret); diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index 7f8f896fa0c3..cc0549a9fc64 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -1943,7 +1943,7 @@ of_i3c_master_add_i2c_boardinfo(struct i3c_master_controller *master, if (!boardinfo) return -ENOMEM; - ret = of_i2c_get_board_info(dev, node, &boardinfo->base); + ret = of_i2c_get_board_info(node, &boardinfo->base); if (ret) return ret; diff --git a/include/linux/i2c.h b/include/linux/i2c.h index f834687989f7..d84aaf0d83d5 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -942,8 +942,7 @@ const struct of_device_id *i2c_of_match_device(const struct of_device_id *matches, struct i2c_client *client); -int of_i2c_get_board_info(struct device *dev, struct device_node *node, - struct i2c_board_info *info); +int of_i2c_get_board_info(struct device_node *node, struct i2c_board_info *info); #else @@ -969,8 +968,7 @@ static inline const struct of_device_id return NULL; } -static inline int of_i2c_get_board_info(struct device *dev, - struct device_node *node, +static inline int of_i2c_get_board_info(struct device_node *node, struct i2c_board_info *info) { return -ENOTSUPP;