Skip to content

Commit

Permalink
libata: change ata_<foo>_printk routines to return void
Browse files Browse the repository at this point in the history
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: Joe Perches <joe@perches.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
  • Loading branch information
Joe Perches authored and Tejun Heo committed Sep 23, 2014
1 parent 8494294 commit d7bead1
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 28 deletions.
35 changes: 13 additions & 22 deletions drivers/ata/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -6772,70 +6772,61 @@ const struct ata_port_info ata_dummy_port_info = {
/*
* Utility print functions
*/
int ata_port_printk(const struct ata_port *ap, const char *level,
const char *fmt, ...)
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,
const char *fmt, ...)
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);

vaf.fmt = fmt;
vaf.va = &args;

if (sata_pmp_attached(link->ap) || link->ap->slave_link)
r = printk("%sata%u.%02u: %pV",
level, link->ap->print_id, link->pmp, &vaf);
printk("%sata%u.%02u: %pV",
level, link->ap->print_id, link->pmp, &vaf);
else
r = printk("%sata%u: %pV",
level, link->ap->print_id, &vaf);
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",
level, dev->link->ap->print_id, dev->link->pmp + dev->devno,
&vaf);
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);

Expand Down
12 changes: 6 additions & 6 deletions include/linux/libata.h
Original file line number Diff line number Diff line change
Expand Up @@ -1404,14 +1404,14 @@ 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,
const char *fmt, ...);
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,
const char *fmt, ...);
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,
const char *fmt, ...);
void ata_dev_printk(const struct ata_device *dev, const char *level,
const char *fmt, ...);

#define ata_port_err(ap, fmt, ...) \
ata_port_printk(ap, KERN_ERR, fmt, ##__VA_ARGS__)
Expand Down

0 comments on commit d7bead1

Please sign in to comment.