Commit c2e366a1 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: update ata_*_printk() macros such that level can be a variable 



Make prink helpers format @lv together rather than prepending to the
format string as constant.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 0d02f0b2

include/linux/libata.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -1013,18 +1013,18 @@ extern void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset, 
 * printk helpers

 * printk helpers

 */

 */

#define ata_port_printk(ap, lv, fmt, args...) \

#define ata_port_printk(ap, lv, fmt, args...) \

	printk(lv"ata%u: "fmt, (ap)->print_id , ##args)

	printk("%sata%u: "fmt, lv, (ap)->print_id , ##args)





#define ata_link_printk(link, lv, fmt, args...) do { \

#define ata_link_printk(link, lv, fmt, args...) do { \

	if ((link)->ap->nr_pmp_links) \

	if ((link)->ap->nr_pmp_links) \

		printk(lv"ata%u.%02u: "fmt, (link)->ap->print_id, \

		printk("%sata%u.%02u: "fmt, lv, (link)->ap->print_id,	\

		       (link)->pmp , ##args); \

		       (link)->pmp , ##args); \

	else \

	else \

		printk(lv"ata%u: "fmt, (link)->ap->print_id , ##args); \

		printk("%sata%u: "fmt, lv, (link)->ap->print_id , ##args); \

	} while(0)

	} while(0)





#define ata_dev_printk(dev, lv, fmt, args...) \

#define ata_dev_printk(dev, lv, fmt, args...) \

	printk(lv"ata%u.%02u: "fmt, (dev)->link->ap->print_id, \

	printk("%sata%u.%02u: "fmt, lv, (dev)->link->ap->print_id,	\

	       (dev)->link->pmp + (dev)->devno , ##args)

	       (dev)->link->pmp + (dev)->devno , ##args)





/*

/*