Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 07:10:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

w1: use pr_* instead of printk

Browse Source 
This patch replaces all calls to the "printk" function within the main "w1"
directory by calls to the appropriate "pr_*" function thus addressing
the following warning generated by the checkpatch script:

WARNING: Prefer [subsystem eg: netdev]_err([subsystem]dev, ...
        then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...

Signed-off-by: Fjodor Schelichow <fjodor.schelichow@hotmail.com>
Signed-off-by: Roman Sommer <romsom2@yahoo.de>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Fjodor Schelichow 2014-06-19 02:52:00 +02:00 committed by Greg Kroah-Hartman
parent ea022eac1e
commit fdc9167a78
5 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/w1/w1.c
View File

@ -1162,28 +1162,26 @@ static int __init w1_init(void)
{ {
int retval; int retval;
printk(KERN_INFO "Driver for 1-wire Dallas network protocol.\n"); pr_info("Driver for 1-wire Dallas network protocol.\n");
w1_init_netlink(); w1_init_netlink();
retval = bus_register(&w1_bus_type); retval = bus_register(&w1_bus_type);
if (retval) { if (retval) {
printk(KERN_ERR "Failed to register bus. err=%d.\n", retval); pr_err("Failed to register bus. err=%d.\n", retval);
goto err_out_exit_init; goto err_out_exit_init;
} }
retval = driver_register(&w1_master_driver); retval = driver_register(&w1_master_driver);
if (retval) { if (retval) {
printk(KERN_ERR pr_err("Failed to register master driver. err=%d.\n",
"Failed to register master driver. err=%d.\n",
retval); retval);
goto err_out_bus_unregister; goto err_out_bus_unregister;
} }
retval = driver_register(&w1_slave_driver); retval = driver_register(&w1_slave_driver);
if (retval) { if (retval) {
printk(KERN_ERR pr_err("Failed to register slave driver. err=%d.\n",
"Failed to register slave driver. err=%d.\n",
retval); retval);
goto err_out_master_unregister; goto err_out_master_unregister;
} }

2
drivers/w1/w1_family.c
View File

@ -87,7 +87,7 @@ void w1_unregister_family(struct w1_family *fent)
w1_reconnect_slaves(fent, 0); w1_reconnect_slaves(fent, 0);
while (atomic_read(&fent->refcnt)) { while (atomic_read(&fent->refcnt)) {
printk(KERN_INFO "Waiting for family %u to become free: refcnt=%d.\n", pr_info("Waiting for family %u to become free: refcnt=%d.\n",
fent->fid, atomic_read(&fent->refcnt)); fent->fid, atomic_read(&fent->refcnt));
if (msleep_interruptible(1000)) if (msleep_interruptible(1000))

9
drivers/w1/w1_int.c
View File

@ -50,8 +50,7 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
*/ */
dev = kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL); dev = kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL);
if (!dev) { if (!dev) {
printk(KERN_ERR pr_err("Failed to allocate %zd bytes for new w1 device.\n",
"Failed to allocate %zd bytes for new w1 device.\n",
sizeof(struct w1_master)); sizeof(struct w1_master));
return NULL; return NULL;
} }
@ -91,7 +90,7 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
err = device_register(&dev->dev); err = device_register(&dev->dev);
if (err) { if (err) {
printk(KERN_ERR "Failed to register master device. err=%d\n", err); pr_err("Failed to register master device. err=%d\n", err);
memset(dev, 0, sizeof(struct w1_master)); memset(dev, 0, sizeof(struct w1_master));
kfree(dev); kfree(dev);
dev = NULL; dev = NULL;
@ -120,7 +119,7 @@ int w1_add_master_device(struct w1_bus_master *master)
if (!(master->touch_bit && master->reset_bus) && if (!(master->touch_bit && master->reset_bus) &&
!(master->write_bit && master->read_bit) && !(master->write_bit && master->read_bit) &&
!(master->write_byte && master->read_byte && master->reset_bus)) { !(master->write_byte && master->read_byte && master->reset_bus)) {
printk(KERN_ERR "w1_add_master_device: invalid function set\n"); pr_err("w1_add_master_device: invalid function set\n");
return(-EINVAL); return(-EINVAL);
} }
@ -254,7 +253,7 @@ void w1_remove_master_device(struct w1_bus_master *bm)
} }
if (!found) { if (!found) {
printk(KERN_ERR "Device doesn't exist.\n"); pr_err("Device doesn't exist.\n");
return; return;
} }

4
drivers/w1/w1_log.h
View File

@ -29,8 +29,8 @@
#else #else
# define assert(expr) \ # define assert(expr) \
if(unlikely(!(expr))) { \ if(unlikely(!(expr))) { \
printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n", \ pr_err("Assertion failed! %s,%s,%s,line=%d\n", \
#expr, __FILE__, __func__, __LINE__); \ #expr, __FILE__, __func__, __LINE__); \
} }
#endif #endif

3
drivers/w1/w1_netlink.c
View File

@ -680,8 +680,7 @@ static void w1_cn_callback(struct cn_msg *cn, struct netlink_skb_parms *nsp)
if (sl) if (sl)
dev = sl->master; dev = sl->master;
} else { } else {
printk(KERN_NOTICE pr_notice("%s: cn: %x.%x, wrong type: %u, len: %u.\n",
"%s: cn: %x.%x, wrong type: %u, len: %u.\n",
__func__, cn->id.idx, cn->id.val, __func__, cn->id.idx, cn->id.val,
msg->type, msg->len); msg->type, msg->len);
err = -EPROTO; err = -EPROTO;