i2c: dev: Define pr_fmt() and drop duplication substrings
Subsystems (2)
PATCH 1/2 i2c: dev: Define pr_fmt() and drop duplication substrings
Define pr_fmt() to print module name as prefix and at the same time drop duplication substrings in the messages.
While at it, convert printk(<LEVEL>) to pr_<level>().
--- drivers/i2c/i2c-dev.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/i2c/i2c-dev.c +9 -11
@@ -14,6 +14,8 @@/* The I2C_RDWR ioctl code is written by Kolja Waschk <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/cdev.h> #include <linux/compat.h> #include <linux/device.h>
@@ -68,8 +70,7 @@ static struct i2c_dev *get_free_i2c_dev(struct i2c_adapter *adap)struct i2c_dev *i2c_dev;if (adap->nr >=I2C_MINORS ) { -printk (KERN_ERR "i2c-dev: Out of device minors (%d)\n" , - adap->nr); +pr_err ("Out of device minors (%d)\n" , adap->nr);return ERR_PTR (-ENODEV ); }
@@ -145,8 +146,7 @@ static ssize_t i2cdev_read(struct file *file, char __user *buf, size_t count,if (tmp ==NULL )return -ENOMEM ; -pr_debug ("i2c-dev: i2c-%d reading %zu bytes.\n" , -iminor (file_inode (file)), count); +pr_debug ("i2c-%d reading %zu bytes.\n" ,iminor (file_inode (file)), count); ret =i2c_master_recv (client, tmp, count);if (ret >=0 )
@@ -169,8 +169,7 @@ static ssize_t i2cdev_write(struct file *file, const char __user *buf,if (IS_ERR (tmp))return PTR_ERR (tmp); -pr_debug ("i2c-dev: i2c-%d writing %zu bytes.\n" , -iminor (file_inode (file)), count); +pr_debug ("i2c-%d writing %zu bytes.\n" ,iminor (file_inode (file)), count); ret =i2c_master_send (client, tmp, count);kfree (tmp);
@@ -673,8 +672,7 @@ static int i2cdev_attach_adapter(struct device *dev, void *dummy)return res; } -pr_debug ("i2c-dev: adapter [%s] registered as minor %d\n" , - adap->name, adap->nr); +pr_debug ("adapter [%s] registered as minor %d\n" , adap->name, adap->nr);return 0 ; }
@@ -693,7 +691,7 @@ static int i2cdev_detach_adapter(struct device *dev, void *dummy)put_i2c_dev (i2c_dev, true); -pr_debug ("i2c-dev: adapter [%s] unregistered\n" , adap->name); +pr_debug ("adapter [%s] unregistered\n" , adap->name);return 0 ; }
@@ -726,7 +724,7 @@ static int __init i2c_dev_init(void) {int res; -printk (KERN_INFO "i2c /dev entries driver\n" ); +pr_info ("i2c /dev entries driver\n" ); res =register_chrdev_region (MKDEV (I2C_MAJOR ,0 ),I2C_MINORS ,"i2c" );if (res)
@@ -754,7 +752,7 @@ static int __init i2c_dev_init(void) out_unreg_chrdev:unregister_chrdev_region (MKDEV (I2C_MAJOR ,0 ),I2C_MINORS ); out: -printk (KERN_ERR "%s: Driver Initialisation failed\n" , __FILE__); +pr_err ("Driver Initialisation failed\n" );return res; }
Signature · 1 line
2.30.2
PATCH 2/2 i2c: dev: Use sysfs_emit() in "show" functions
The sysfs_emit() function was introduced to make it less ambiguous which function is preferred when writing to the output buffer in a "show" callback [1].
Convert the I²C device sysfs interface from sprintf() to sysfs_emit() accordingly, as the latter is aware of the PAGE_SIZE buffer and correctly returns the number of bytes written into the buffer.
No functional change intended.
[1] Documentation/filesystems/sysfs.rst
--- drivers/i2c/i2c-dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/i2c-dev.c +1 -1
@@ -102,7 +102,7 @@ static ssize_t name_show(struct device *dev,if (!i2c_dev)return -ENODEV ; -return sprintf (buf,"%s\n" , i2c_dev->adap->name); +return sysfs_emit (buf,"%s\n" , i2c_dev->adap->name); }static DEVICE_ATTR_RO (name);
Signature · 1 line
2.30.2
Wolfram Sang
AppliedRe: [PATCH v1 2/2] i2c: dev: Use sysfs_emit() in "show" functions
Quoted 8 lines · Andy Shevchenko
The
sysfs_emit()function was introduced to make it less ambiguous which function is preferred when writing to the output buffer in a "show" callback [1].Convert the I²C device sysfs interface from
sprintf()tosysfs_emit()accordingly, as the latter is aware of thePAGE_SIZEbuffer and correctly returns the number of bytes written into the buffer.
Quoted 5 lines
No functional change intended.
[1]
Documentation/filesystems/sysfs.rstSigned-off-by Andy Shevchenko <[email protected]>
Applied to for-next, thanks!
Wolfram Sang
AppliedQuoted 6 lines · Andy Shevchenko
Define
pr_fmt()to print module name as prefix and at the same time drop duplication substrings in the messages.While at it, convert printk(<LEVEL>) to pr_<level>().
Signed-off-by Andy Shevchenko <[email protected]>
Applied to for-next, thanks!