diff options
author | Wolfram Sang <wsa-dev@sang-engineering.com> | 2016-07-09 00:35:04 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2016-07-14 09:08:08 -0400 |
commit | 44239a5afd7c568047fbaba8f32fb4b4464902b4 (patch) | |
tree | a3c0258570c307d9cbc754ef6d66d96dc7f301b7 /drivers/i2c/i2c-core.c | |
parent | be309c3cd3dcbebbd2b742e9a2a24482c92e01ff (diff) |
i2c: use pr_fmt in the core
Now that we revisited all error messages, we can use pr_fmt for the
remaining pr_* messages to ensure consistent output.
Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/i2c-core.c')
-rw-r--r-- | drivers/i2c/i2c-core.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 4b3d760b3f51..b2b34a0a35a1 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
@@ -27,6 +27,8 @@ | |||
27 | I2C slave support (c) 2014 by Wolfram Sang <wsa@sang-engineering.com> | 27 | I2C slave support (c) 2014 by Wolfram Sang <wsa@sang-engineering.com> |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #define pr_fmt(fmt) "i2c-core: " fmt | ||
31 | |||
30 | #include <dt-bindings/i2c/i2c.h> | 32 | #include <dt-bindings/i2c/i2c.h> |
31 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
32 | #include <linux/acpi.h> | 34 | #include <linux/acpi.h> |
@@ -1609,7 +1611,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap) | |||
1609 | goto out_list; | 1611 | goto out_list; |
1610 | 1612 | ||
1611 | if (!adap->algo) { | 1613 | if (!adap->algo) { |
1612 | pr_err("i2c-core: adapter '%s': no algo supplied!\n", adap->name); | 1614 | pr_err("adapter '%s': no algo supplied!\n", adap->name); |
1613 | goto out_list; | 1615 | goto out_list; |
1614 | } | 1616 | } |
1615 | 1617 | ||
@@ -1633,8 +1635,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap) | |||
1633 | adap->dev.type = &i2c_adapter_type; | 1635 | adap->dev.type = &i2c_adapter_type; |
1634 | res = device_register(&adap->dev); | 1636 | res = device_register(&adap->dev); |
1635 | if (res) { | 1637 | if (res) { |
1636 | pr_err("i2c-core: adapter '%s': can't register device (%d)\n", | 1638 | pr_err("adapter '%s': can't register device (%d)\n", adap->name, res); |
1637 | adap->name, res); | ||
1638 | goto out_list; | 1639 | goto out_list; |
1639 | } | 1640 | } |
1640 | 1641 | ||
@@ -1825,8 +1826,7 @@ void i2c_del_adapter(struct i2c_adapter *adap) | |||
1825 | found = idr_find(&i2c_adapter_idr, adap->nr); | 1826 | found = idr_find(&i2c_adapter_idr, adap->nr); |
1826 | mutex_unlock(&core_lock); | 1827 | mutex_unlock(&core_lock); |
1827 | if (found != adap) { | 1828 | if (found != adap) { |
1828 | pr_debug("i2c-core: attempting to delete unregistered " | 1829 | pr_debug("attempting to delete unregistered adapter [%s]\n", adap->name); |
1829 | "adapter [%s]\n", adap->name); | ||
1830 | return; | 1830 | return; |
1831 | } | 1831 | } |
1832 | 1832 | ||
@@ -1986,7 +1986,7 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver) | |||
1986 | if (res) | 1986 | if (res) |
1987 | return res; | 1987 | return res; |
1988 | 1988 | ||
1989 | pr_debug("i2c-core: driver [%s] registered\n", driver->driver.name); | 1989 | pr_debug("driver [%s] registered\n", driver->driver.name); |
1990 | 1990 | ||
1991 | INIT_LIST_HEAD(&driver->clients); | 1991 | INIT_LIST_HEAD(&driver->clients); |
1992 | /* Walk the adapters that are already present */ | 1992 | /* Walk the adapters that are already present */ |
@@ -2013,7 +2013,7 @@ void i2c_del_driver(struct i2c_driver *driver) | |||
2013 | i2c_for_each_dev(driver, __process_removed_driver); | 2013 | i2c_for_each_dev(driver, __process_removed_driver); |
2014 | 2014 | ||
2015 | driver_unregister(&driver->driver); | 2015 | driver_unregister(&driver->driver); |
2016 | pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name); | 2016 | pr_debug("driver [%s] unregistered\n", driver->driver.name); |
2017 | } | 2017 | } |
2018 | EXPORT_SYMBOL(i2c_del_driver); | 2018 | EXPORT_SYMBOL(i2c_del_driver); |
2019 | 2019 | ||
@@ -2722,7 +2722,7 @@ static int i2c_smbus_check_pec(u8 cpec, struct i2c_msg *msg) | |||
2722 | cpec = i2c_smbus_msg_pec(cpec, msg); | 2722 | cpec = i2c_smbus_msg_pec(cpec, msg); |
2723 | 2723 | ||
2724 | if (rpec != cpec) { | 2724 | if (rpec != cpec) { |
2725 | pr_debug("i2c-core: Bad PEC 0x%02x vs. 0x%02x\n", | 2725 | pr_debug("Bad PEC 0x%02x vs. 0x%02x\n", |
2726 | rpec, cpec); | 2726 | rpec, cpec); |
2727 | return -EBADMSG; | 2727 | return -EBADMSG; |
2728 | } | 2728 | } |