diff options
author | Joe Perches <joe@perches.com> | 2014-09-22 12:52:18 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-09-23 10:02:31 -0400 |
commit | d7bead1b8890c3e47a24db270fdb840ea728d8f0 (patch) | |
tree | e576086dee390d2ccd8111ccc423b27a7228cb6c /drivers | |
parent | 8494294b66dbb4d7996dd944575eebd4ac2a126b (diff) |
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: Joe Perches <joe@perches.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/libata-core.c | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 782d126cf191..f785ae50a0ea 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -6772,32 +6772,28 @@ const struct ata_port_info ata_dummy_port_info = { | |||
6772 | /* | 6772 | /* |
6773 | * Utility print functions | 6773 | * Utility print functions |
6774 | */ | 6774 | */ |
6775 | int ata_port_printk(const struct ata_port *ap, const char *level, | 6775 | void ata_port_printk(const struct ata_port *ap, const char *level, |
6776 | const char *fmt, ...) | 6776 | const char *fmt, ...) |
6777 | { | 6777 | { |
6778 | struct va_format vaf; | 6778 | struct va_format vaf; |
6779 | va_list args; | 6779 | va_list args; |
6780 | int r; | ||
6781 | 6780 | ||
6782 | va_start(args, fmt); | 6781 | va_start(args, fmt); |
6783 | 6782 | ||
6784 | vaf.fmt = fmt; | 6783 | vaf.fmt = fmt; |
6785 | vaf.va = &args; | 6784 | vaf.va = &args; |
6786 | 6785 | ||
6787 | r = printk("%sata%u: %pV", level, ap->print_id, &vaf); | 6786 | printk("%sata%u: %pV", level, ap->print_id, &vaf); |
6788 | 6787 | ||
6789 | va_end(args); | 6788 | va_end(args); |
6790 | |||
6791 | return r; | ||
6792 | } | 6789 | } |
6793 | EXPORT_SYMBOL(ata_port_printk); | 6790 | EXPORT_SYMBOL(ata_port_printk); |
6794 | 6791 | ||
6795 | int ata_link_printk(const struct ata_link *link, const char *level, | 6792 | void ata_link_printk(const struct ata_link *link, const char *level, |
6796 | const char *fmt, ...) | 6793 | const char *fmt, ...) |
6797 | { | 6794 | { |
6798 | struct va_format vaf; | 6795 | struct va_format vaf; |
6799 | va_list args; | 6796 | va_list args; |
6800 | int r; | ||
6801 | 6797 | ||
6802 | va_start(args, fmt); | 6798 | va_start(args, fmt); |
6803 | 6799 | ||
@@ -6805,37 +6801,32 @@ int ata_link_printk(const struct ata_link *link, const char *level, | |||
6805 | vaf.va = &args; | 6801 | vaf.va = &args; |
6806 | 6802 | ||
6807 | if (sata_pmp_attached(link->ap) || link->ap->slave_link) | 6803 | if (sata_pmp_attached(link->ap) || link->ap->slave_link) |
6808 | r = printk("%sata%u.%02u: %pV", | 6804 | printk("%sata%u.%02u: %pV", |
6809 | level, link->ap->print_id, link->pmp, &vaf); | 6805 | level, link->ap->print_id, link->pmp, &vaf); |
6810 | else | 6806 | else |
6811 | r = printk("%sata%u: %pV", | 6807 | printk("%sata%u: %pV", |
6812 | level, link->ap->print_id, &vaf); | 6808 | level, link->ap->print_id, &vaf); |
6813 | 6809 | ||
6814 | va_end(args); | 6810 | va_end(args); |
6815 | |||
6816 | return r; | ||
6817 | } | 6811 | } |
6818 | EXPORT_SYMBOL(ata_link_printk); | 6812 | EXPORT_SYMBOL(ata_link_printk); |
6819 | 6813 | ||
6820 | int ata_dev_printk(const struct ata_device *dev, const char *level, | 6814 | void ata_dev_printk(const struct ata_device *dev, const char *level, |
6821 | const char *fmt, ...) | 6815 | const char *fmt, ...) |
6822 | { | 6816 | { |
6823 | struct va_format vaf; | 6817 | struct va_format vaf; |
6824 | va_list args; | 6818 | va_list args; |
6825 | int r; | ||
6826 | 6819 | ||
6827 | va_start(args, fmt); | 6820 | va_start(args, fmt); |
6828 | 6821 | ||
6829 | vaf.fmt = fmt; | 6822 | vaf.fmt = fmt; |
6830 | vaf.va = &args; | 6823 | vaf.va = &args; |
6831 | 6824 | ||
6832 | r = printk("%sata%u.%02u: %pV", | 6825 | printk("%sata%u.%02u: %pV", |
6833 | level, dev->link->ap->print_id, dev->link->pmp + dev->devno, | 6826 | level, dev->link->ap->print_id, dev->link->pmp + dev->devno, |
6834 | &vaf); | 6827 | &vaf); |
6835 | 6828 | ||
6836 | va_end(args); | 6829 | va_end(args); |
6837 | |||
6838 | return r; | ||
6839 | } | 6830 | } |
6840 | EXPORT_SYMBOL(ata_dev_printk); | 6831 | EXPORT_SYMBOL(ata_dev_printk); |
6841 | 6832 | ||