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

Commit d7bead1b authored by Joe Perches's avatar Joe Perches Committed by Tejun Heo
Browse files

libata: change ata_<foo>_printk routines to return void 



The return value is not used by callers of these functions nor
by uses of all macros so change the functions to return void.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 8494294b

drivers/ata/libata-core.c

+13 −22
Original line number Diff line number Diff line
@@ -6772,32 +6772,28 @@ const struct ata_port_info ata_dummy_port_info = { 
/*

 * Utility print functions

 */

int ata_port_printk(const struct ata_port *ap, const char *level,

void ata_port_printk(const struct ata_port *ap, const char *level,

		     const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;

	int r;



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	r = printk("%sata%u: %pV", level, ap->print_id, &vaf);

	printk("%sata%u: %pV", level, ap->print_id, &vaf);



	va_end(args);



	return r;

}

EXPORT_SYMBOL(ata_port_printk);



int ata_link_printk(const struct ata_link *link, const char *level,

void ata_link_printk(const struct ata_link *link, const char *level,

		     const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;

	int r;



	va_start(args, fmt);
@@ -6805,37 +6801,32 @@ int ata_link_printk(const struct ata_link *link, const char *level, 
	vaf.va = &args;



	if (sata_pmp_attached(link->ap) || link->ap->slave_link)

		r = printk("%sata%u.%02u: %pV",

		printk("%sata%u.%02u: %pV",

		       level, link->ap->print_id, link->pmp, &vaf);

	else

		r = printk("%sata%u: %pV",

		printk("%sata%u: %pV",

		       level, link->ap->print_id, &vaf);



	va_end(args);



	return r;

}

EXPORT_SYMBOL(ata_link_printk);



int ata_dev_printk(const struct ata_device *dev, const char *level,

void ata_dev_printk(const struct ata_device *dev, const char *level,

		    const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;

	int r;



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	r = printk("%sata%u.%02u: %pV",

	printk("%sata%u.%02u: %pV",

	       level, dev->link->ap->print_id, dev->link->pmp + dev->devno,

	       &vaf);



	va_end(args);



	return r;

}

EXPORT_SYMBOL(ata_dev_printk);

include/linux/libata.h

+6 −6
Original line number Diff line number Diff line
@@ -1404,13 +1404,13 @@ static inline int sata_srst_pmp(struct ata_link *link) 
 * printk helpers

 */

__printf(3, 4)

int ata_port_printk(const struct ata_port *ap, const char *level,

void ata_port_printk(const struct ata_port *ap, const char *level,

		     const char *fmt, ...);

__printf(3, 4)

int ata_link_printk(const struct ata_link *link, const char *level,

void ata_link_printk(const struct ata_link *link, const char *level,

		     const char *fmt, ...);

__printf(3, 4)

int ata_dev_printk(const struct ata_device *dev, const char *level,

void ata_dev_printk(const struct ata_device *dev, const char *level,

		    const char *fmt, ...);



#define ata_port_err(ap, fmt, ...)				\