Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / ata / libata-core.c

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index f3e7b9f894cd131daea921fbd0e149fcaccadaeb..c5ba15af87d3eccd8553f0daab21a4f5237e8d91 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4261,10 +4261,10 @@ static unsigned long ata_dev_blacklisted(const struct ata_device *dev)
        ata_id_c_string(dev->id, model_rev, ATA_ID_FW_REV, sizeof(model_rev));
 
        while (ad->model_num) {
-               if (glob_match(model_num, ad->model_num)) {
+               if (glob_match(ad->model_num, model_num)) {
                        if (ad->model_rev == NULL)
                                return ad->horkage;
-                       if (glob_match(model_rev, ad->model_rev))
+                       if (glob_match(ad->model_rev, model_rev))
                                return ad->horkage;
                }
                ad++;
@@ -6227,7 +6227,7 @@ int ata_host_activate(struct ata_host *host, int irq,
        }
 
        rc = devm_request_irq(host->dev, irq, irq_handler, irq_flags,
-                             dev_driver_string(host->dev), host);
+                             dev_name(host->dev), host);
        if (rc)
                return rc;
 
@@ -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,
-                   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);
 
@@ -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",
-                          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);