Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

Pull libata update from Tejun Heo:
 "AHCI is getting per-port irq handling and locks for better
  scalability.  The gain is not huge but measureable with multiple high
  iops devices connected to the same host; however, the value of
  threaded IRQ handling seems negligible for AHCI and it likely will
  revert to non-threaded handling soon.

  Another noteworthy change is George Spelvin's "libata: Un-break ATA
  blacklist".  During 3.17 devel cycle, the libata blacklist glob
  matching got generalized and rewritten; unfortunately, the patch
  forgot to swap arguments to match the new match function and ended up
  breaking blacklist matching completely.  It got noticed only a couple
  days ago so it couldn't make for-3.17-fixes either.  :(

  Other than the above two, nothing too interesting - the usual cleanup
  churns and device-specific changes"

* 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (22 commits)
  pata_serverworks: disable 64-KB DMA transfers on Broadcom OSB4 IDE Controller
  libata: Un-break ATA blacklist
  AHCI: Do not acquire ata_host::lock from single IRQ handler
  AHCI: Optimize single IRQ interrupt processing
  AHCI: Do not read HOST_IRQ_STAT reg in multi-MSI mode
  AHCI: Make few function names more descriptive
  AHCI: Move host activation code into ahci_host_activate()
  AHCI: Move ahci_host_activate() function to libahci.c
  AHCI: Pass SCSI host template as arg to ahci_host_activate()
  ata: pata_imx: Use the SIMPLE_DEV_PM_OPS() macro
  AHCI: Cleanup checking of multiple MSIs/SLM modes
  libata-sff: Fix controllers with no ctl port
  ahci_xgene: Fix the error print invalid resource for APM X-Gene SoC AHCI SATA Host Controller driver.
  libata: change ata_<foo>_printk routines to return void
  ata: qcom: Add device tree bindings information
  ahci-platform: Bump max number of clocks to 5
  ahci: ahci_p5wdh_workaround - constify DMI table
  libahci_platform: Staticize ahci_platform_<en/dis>able_phys()
  pata_platform: Remove useless irq_flags field
  pata_of_platform: Remove "electra-ide" quirk
  ...

1 files changed, 16 insertions, 25 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index f3e7b9f894cd..c5ba15af87d3 100644
--- 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);