- don't prefix the device if %pOF is provided. That information is
enough.
- move the prefix to pr_fmt
- change prefix from "of_i2c" to "i2c_of" because the code was moved
out of the of-domain long ago
- drop error string for callers of of_i2c_register_device because it
already reports enough (thanks to Tang Bin for the report!)
Signed-off-by: Wolfram Sang <[email protected]>
Reviewed-by: Geert Uytterhoeven <[email protected]>
---
drivers/i2c/i2c-core-of.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c
index 710704cd583e..f2d09ea0d336 100644
--- a/drivers/i2c/i2c-core-of.c
+++ b/drivers/i2c/i2c-core-of.c
@@ -8,6 +8,8 @@
* Copyright (C) 2013, 2018 Wolfram Sang <[email protected]>
*/
+#define pr_fmt(fmt) "i2c_of: " fmt
+
#include <dt-bindings/i2c/i2c.h>
#include <linux/device.h>
#include <linux/err.h>
@@ -28,7 +30,7 @@ int of_i2c_get_board_info(struct device_node *node, struct i2c_board_info *info)
ret = of_property_read_u32(node, "reg", &addr);
if (ret) {
- pr_err("of_i2c: invalid reg on %pOF\n", node);
+ pr_err("invalid reg on %pOF\n", node);
return ret;
}
@@ -66,7 +68,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,
struct i2c_board_info info;
int ret;
- dev_dbg(&adap->dev, "of_i2c: register %pOF\n", node);
+ pr_debug("register %pOF\n", node);
ret = of_i2c_get_board_info(node, &info);
if (ret)
@@ -74,7 +76,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,
client = i2c_new_client_device(adap, &info);
if (IS_ERR(client))
- dev_err(&adap->dev, "of_i2c: Failure registering %pOF\n", node);
+ pr_err("failure registering %pOF (%ld)\n", node, PTR_ERR(client));
return client;
}
@@ -88,7 +90,7 @@ void of_i2c_register_devices(struct i2c_adapter *adap)
if (!adap->dev.of_node)
return;
- dev_dbg(&adap->dev, "of_i2c: walking child nodes\n");
+ dev_dbg(&adap->dev, "walking child nodes\n");
bus = of_get_child_by_name(adap->dev.of_node, "i2c-bus");
if (!bus)
@@ -99,12 +101,8 @@ void of_i2c_register_devices(struct i2c_adapter *adap)
continue;
client = of_i2c_register_device(adap, node);
- if (IS_ERR(client)) {
- dev_err(&adap->dev,
- "Failed to create I2C device for %pOF\n",
- node);
+ if (IS_ERR(client))
of_node_clear_flag(node, OF_POPULATED);
- }
}
of_node_put(bus);
@@ -243,8 +241,6 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action,
client = of_i2c_register_device(adap, rd->dn);
if (IS_ERR(client)) {
- dev_err(&adap->dev, "failed to create client for '%pOF'\n",
- rd->dn);
put_device(&adap->dev);
of_node_clear_flag(rd->dn, OF_POPULATED);
return notifier_from_errno(PTR_ERR(client));
--
2.20.1
Hi,
On 18/03/20 16:00, Wolfram Sang wrote:
> - don't prefix the device if %pOF is provided. That information is
> enough.
> - move the prefix to pr_fmt
> - change prefix from "of_i2c" to "i2c_of" because the code was moved
> out of the of-domain long ago
> - drop error string for callers of of_i2c_register_device because it
> already reports enough (thanks to Tang Bin for the report!)
>
> Signed-off-by: Wolfram Sang <[email protected]>
> Reviewed-by: Geert Uytterhoeven <[email protected]>
Reviewed-by: Luca Ceresoli <[email protected]>
--
Luca
Hi Wolfram,
On 18/03/2020 15:00, Wolfram Sang wrote:
> - don't prefix the device if %pOF is provided. That information is
> enough.
> - move the prefix to pr_fmt
> - change prefix from "of_i2c" to "i2c_of" because the code was moved
> out of the of-domain long ago
> - drop error string for callers of of_i2c_register_device because it
> already reports enough (thanks to Tang Bin for the report!)
>
> Signed-off-by: Wolfram Sang <[email protected]>
> Reviewed-by: Geert Uytterhoeven <[email protected]>
Reviewed-by: Kieran Bingham <[email protected]>
> ---
> drivers/i2c/i2c-core-of.c | 18 +++++++-----------
> 1 file changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c
> index 710704cd583e..f2d09ea0d336 100644
> --- a/drivers/i2c/i2c-core-of.c
> +++ b/drivers/i2c/i2c-core-of.c
> @@ -8,6 +8,8 @@
> * Copyright (C) 2013, 2018 Wolfram Sang <[email protected]>
> */
>
> +#define pr_fmt(fmt) "i2c_of: " fmt
> +
> #include <dt-bindings/i2c/i2c.h>
> #include <linux/device.h>
> #include <linux/err.h>
> @@ -28,7 +30,7 @@ int of_i2c_get_board_info(struct device_node *node, struct i2c_board_info *info)
>
> ret = of_property_read_u32(node, "reg", &addr);
> if (ret) {
> - pr_err("of_i2c: invalid reg on %pOF\n", node);
> + pr_err("invalid reg on %pOF\n", node);
> return ret;
> }
>
> @@ -66,7 +68,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,
> struct i2c_board_info info;
> int ret;
>
> - dev_dbg(&adap->dev, "of_i2c: register %pOF\n", node);
> + pr_debug("register %pOF\n", node);
>
> ret = of_i2c_get_board_info(node, &info);
> if (ret)
> @@ -74,7 +76,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,
>
> client = i2c_new_client_device(adap, &info);
> if (IS_ERR(client))
> - dev_err(&adap->dev, "of_i2c: Failure registering %pOF\n", node);
> + pr_err("failure registering %pOF (%ld)\n", node, PTR_ERR(client));
>
> return client;
> }
> @@ -88,7 +90,7 @@ void of_i2c_register_devices(struct i2c_adapter *adap)
> if (!adap->dev.of_node)
> return;
>
> - dev_dbg(&adap->dev, "of_i2c: walking child nodes\n");
> + dev_dbg(&adap->dev, "walking child nodes\n");
>
> bus = of_get_child_by_name(adap->dev.of_node, "i2c-bus");
> if (!bus)
> @@ -99,12 +101,8 @@ void of_i2c_register_devices(struct i2c_adapter *adap)
> continue;
>
> client = of_i2c_register_device(adap, node);
> - if (IS_ERR(client)) {
> - dev_err(&adap->dev,
> - "Failed to create I2C device for %pOF\n",
> - node);
> + if (IS_ERR(client))
> of_node_clear_flag(node, OF_POPULATED);
> - }
> }
>
> of_node_put(bus);
> @@ -243,8 +241,6 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action,
>
> client = of_i2c_register_device(adap, rd->dn);
> if (IS_ERR(client)) {
> - dev_err(&adap->dev, "failed to create client for '%pOF'\n",
> - rd->dn);
> put_device(&adap->dev);
> of_node_clear_flag(rd->dn, OF_POPULATED);
> return notifier_from_errno(PTR_ERR(client));
>
Hi Wolfram,
On 15/04/2020 09:17, Kieran Bingham wrote:
> Hi Wolfram,
>
> On 18/03/2020 15:00, Wolfram Sang wrote:
>> - don't prefix the device if %pOF is provided. That information is
>> enough.
>> - move the prefix to pr_fmt
>> - change prefix from "of_i2c" to "i2c_of" because the code was moved
>> out of the of-domain long ago
>> - drop error string for callers of of_i2c_register_device because it
>> already reports enough (thanks to Tang Bin for the report!)
>>
>> Signed-off-by: Wolfram Sang <[email protected]>
>> Reviewed-by: Geert Uytterhoeven <[email protected]>
>
> Reviewed-by: Kieran Bingham <[email protected]>
>
>> ---
>> drivers/i2c/i2c-core-of.c | 18 +++++++-----------
>> 1 file changed, 7 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c
>> index 710704cd583e..f2d09ea0d336 100644
>> --- a/drivers/i2c/i2c-core-of.c
>> +++ b/drivers/i2c/i2c-core-of.c
>> @@ -8,6 +8,8 @@
>> * Copyright (C) 2013, 2018 Wolfram Sang <[email protected]>
>> */
>>
>> +#define pr_fmt(fmt) "i2c_of: " fmt
>> +
>> #include <dt-bindings/i2c/i2c.h>
>> #include <linux/device.h>
>> #include <linux/err.h>
>> @@ -28,7 +30,7 @@ int of_i2c_get_board_info(struct device_node *node, struct i2c_board_info *info)
Perhaps not directly needed by this patch but,
at some point will you rename of_i2c_* to i2c_of_* ?
>>
>> ret = of_property_read_u32(node, "reg", &addr);
>> if (ret) {
>> - pr_err("of_i2c: invalid reg on %pOF\n", node);
>> + pr_err("invalid reg on %pOF\n", node);
>> return ret;
>> }
>>
>> @@ -66,7 +68,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,
>> struct i2c_board_info info;
>> int ret;
>>
>> - dev_dbg(&adap->dev, "of_i2c: register %pOF\n", node);
>> + pr_debug("register %pOF\n", node);
>>
>> ret = of_i2c_get_board_info(node, &info);
>> if (ret)
>> @@ -74,7 +76,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,
>>
>> client = i2c_new_client_device(adap, &info);
>> if (IS_ERR(client))
>> - dev_err(&adap->dev, "of_i2c: Failure registering %pOF\n", node);
>> + pr_err("failure registering %pOF (%ld)\n", node, PTR_ERR(client));
>>
>> return client;
>> }
>> @@ -88,7 +90,7 @@ void of_i2c_register_devices(struct i2c_adapter *adap)
>> if (!adap->dev.of_node)
>> return;
>>
>> - dev_dbg(&adap->dev, "of_i2c: walking child nodes\n");
>> + dev_dbg(&adap->dev, "walking child nodes\n");
>>
>> bus = of_get_child_by_name(adap->dev.of_node, "i2c-bus");
>> if (!bus)
>> @@ -99,12 +101,8 @@ void of_i2c_register_devices(struct i2c_adapter *adap)
>> continue;
>>
>> client = of_i2c_register_device(adap, node);
>> - if (IS_ERR(client)) {
>> - dev_err(&adap->dev,
>> - "Failed to create I2C device for %pOF\n",
>> - node);
>> + if (IS_ERR(client))
>> of_node_clear_flag(node, OF_POPULATED);
>> - }
>> }
>>
>> of_node_put(bus);
>> @@ -243,8 +241,6 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action,
>>
>> client = of_i2c_register_device(adap, rd->dn);
>> if (IS_ERR(client)) {
>> - dev_err(&adap->dev, "failed to create client for '%pOF'\n",
>> - rd->dn);
>> put_device(&adap->dev);
>> of_node_clear_flag(rd->dn, OF_POPULATED);
>> return notifier_from_errno(PTR_ERR(client));
>>
>