|
@@ -6772,32 +6772,28 @@ const struct ata_port_info ata_dummy_port_info = {
|
|
/*
|
|
/*
|
|
* Utility print functions
|
|
* 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;
|
|
struct va_format vaf;
|
|
va_list args;
|
|
va_list args;
|
|
- int r;
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
|
va_start(args, fmt);
|
|
|
|
|
|
vaf.fmt = fmt;
|
|
vaf.fmt = fmt;
|
|
vaf.va = &args;
|
|
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);
|
|
va_end(args);
|
|
-
|
|
|
|
- return r;
|
|
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(ata_port_printk);
|
|
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;
|
|
struct va_format vaf;
|
|
va_list args;
|
|
va_list args;
|
|
- int r;
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
|
va_start(args, fmt);
|
|
|
|
|
|
@@ -6805,37 +6801,32 @@ int ata_link_printk(const struct ata_link *link, const char *level,
|
|
vaf.va = &args;
|
|
vaf.va = &args;
|
|
|
|
|
|
if (sata_pmp_attached(link->ap) || link->ap->slave_link)
|
|
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
|
|
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);
|
|
va_end(args);
|
|
-
|
|
|
|
- return r;
|
|
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(ata_link_printk);
|
|
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, ...)
|
|
const char *fmt, ...)
|
|
{
|
|
{
|
|
struct va_format vaf;
|
|
struct va_format vaf;
|
|
va_list args;
|
|
va_list args;
|
|
- int r;
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
|
va_start(args, fmt);
|
|
|
|
|
|
vaf.fmt = fmt;
|
|
vaf.fmt = fmt;
|
|
vaf.va = &args;
|
|
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);
|
|
va_end(args);
|
|
-
|
|
|
|
- return r;
|
|
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(ata_dev_printk);
|
|
EXPORT_SYMBOL(ata_dev_printk);
|
|
|
|
|