Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdc9167a authored by Fjodor Schelichow's avatar Fjodor Schelichow Committed by Greg Kroah-Hartman
Browse files

w1: use pr_* instead of printk 



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: default avatarFjodor Schelichow <fjodor.schelichow@hotmail.com>
Signed-off-by: default avatarRoman Sommer <romsom2@yahoo.de>
Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea022eac

drivers/w1/w1.c

+4 −6
Original line number Diff line number Diff line
@@ -1162,28 +1162,26 @@ static int __init w1_init(void) 
{

	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();



	retval = bus_register(&w1_bus_type);

	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;

	}



	retval = driver_register(&w1_master_driver);

	if (retval) {

		printk(KERN_ERR

			"Failed to register master driver. err=%d.\n",

		pr_err("Failed to register master driver. err=%d.\n",

			retval);

		goto err_out_bus_unregister;

	}



	retval = driver_register(&w1_slave_driver);

	if (retval) {

		printk(KERN_ERR

			"Failed to register slave driver. err=%d.\n",

		pr_err("Failed to register slave driver. err=%d.\n",

			retval);

		goto err_out_master_unregister;

	}

drivers/w1/w1_family.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void w1_unregister_family(struct w1_family *fent) 
	w1_reconnect_slaves(fent, 0);



	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));



		if (msleep_interruptible(1000))

drivers/w1/w1_int.c

+4 −5
Original line number Diff line number Diff line
@@ -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);

	if (!dev) {

		printk(KERN_ERR

			"Failed to allocate %zd bytes for new w1 device.\n",

		pr_err("Failed to allocate %zd bytes for new w1 device.\n",

			sizeof(struct w1_master));

		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);

	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));

		kfree(dev);

		dev = NULL;
@@ -120,7 +119,7 @@ int w1_add_master_device(struct w1_bus_master *master) 
	if (!(master->touch_bit && master->reset_bus) &&

	    !(master->write_bit && master->read_bit) &&

	    !(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);

	}
@@ -254,7 +253,7 @@ void w1_remove_master_device(struct w1_bus_master *bm) 
	}



	if (!found) {

		printk(KERN_ERR "Device doesn't exist.\n");

		pr_err("Device doesn't exist.\n");

		return;

	}

drivers/w1/w1_log.h

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#else

#  define assert(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__);		\

        }

#endif

drivers/w1/w1_netlink.c

+1 −2
Original line number Diff line number Diff line
@@ -680,8 +680,7 @@ static void w1_cn_callback(struct cn_msg *cn, struct netlink_skb_parms *nsp) 
			if (sl)

				dev = sl->master;

		} else {

			printk(KERN_NOTICE

				"%s: cn: %x.%x, wrong type: %u, len: %u.\n",

			pr_notice("%s: cn: %x.%x, wrong type: %u, len: %u.\n",

				__func__, cn->id.idx, cn->id.val,

				msg->type, msg->len);

			err = -EPROTO;