Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (51 commits)
  [libata] bump versions
  [libata] Trim trailing whitespace.
  [libata] sata_mv: Fix 50xx irq mask
  [libata] sata_mv: don't touch reserved bits in EDMA config register
  libata: Use new id_to_dma_mode function to tidy reporting in more drivers (minimally tested)
  pata_pcmcia: Fix oops in 2.6.21-rc1
  Add id_to_dma_mode function for printing DMA modes
  sata_promise: simplify port setup
  sata_promise: fix 20619 new EH merge error
  [libata] ACPI: remove needless ->qc_issue hook existence test
  sata_vsc: refactor vsc_sata_interrupt and hook up error handling
  sata_sil: ignore and clear spurious IRQs while executing commands by polling
  sata_mv: fix pci_enable_msi() error handling
  pata_amd: fix an obvious bug in cable detection
  [libata] ata_piix: remove duplicate PCI IDs
  sata_nv: complain on spurious completion notifiers
  libata: test major version in ata_id_is_sata()
  sata_nv: kill old private BMDMA helper functions
  libata: fix remaining ap->id
  ahci: consider SDB FIS containing spurious NCQ completions HSM violation (regenerated)
  ...

1 files changed, 21 insertions, 9 deletions

diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index baca6d79bb0b..598e6a26a481 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -46,7 +46,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_via"
-#define DRV_VERSION     "2.0"
+#define DRV_VERSION     "2.1"
 
 enum board_ids_enum {
         vt6420,
@@ -60,7 +60,7 @@ enum {
         SATA_PATA_SHARING       = 0x49, /* PATA/SATA sharing func ctrl */
         PATA_UDMA_TIMING        = 0xB3, /* PATA timing for DMA/ cable detect */
         PATA_PIO_TIMING         = 0xAB, /* PATA timing register */
-        
+
         PORT0                   = (1 << 1),
         PORT1                   = (1 << 0),
         ALL_PORTS               = PORT0 | PORT1,
@@ -151,7 +151,7 @@ static const struct ata_port_operations vt6420_sata_ops = {
 
 static const struct ata_port_operations vt6421_pata_ops = {
         .port_disable           = ata_port_disable,
-        
+
         .set_piomode            = vt6421_set_pio_mode,
         .set_dmamode            = vt6421_set_dma_mode,
 
@@ -185,7 +185,7 @@ static const struct ata_port_operations vt6421_pata_ops = {
 
 static const struct ata_port_operations vt6421_sata_ops = {
         .port_disable           = ata_port_disable,
-        
+
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
         .check_status           = ata_check_status,
@@ -423,16 +423,21 @@ static struct ata_probe_ent *vt6420_init_probe_ent(struct pci_dev *pdev)
 {
         struct ata_probe_ent *probe_ent;
         struct ata_port_info *ppi[2];
-        void __iomem * const *iomap;
+        void __iomem *bar5;
 
         ppi[0] = ppi[1] = &vt6420_port_info;
         probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
         if (!probe_ent)
                 return NULL;
 
-        iomap = pcim_iomap_table(pdev);
-        probe_ent->port[0].scr_addr = svia_scr_addr(iomap[5], 0);
-        probe_ent->port[1].scr_addr = svia_scr_addr(iomap[5], 1);
+        bar5 = pcim_iomap(pdev, 5, 0);
+        if (!bar5) {
+                dev_printk(KERN_ERR, &pdev->dev, "failed to iomap PCI BAR 5\n");
+                return NULL;
+        }
+
+        probe_ent->port[0].scr_addr = svia_scr_addr(bar5, 0);
+        probe_ent->port[1].scr_addr = svia_scr_addr(bar5, 1);
 
         return probe_ent;
 }
@@ -460,6 +465,13 @@ static struct ata_probe_ent *vt6421_init_probe_ent(struct pci_dev *pdev)
         probe_ent->mwdma_mask   = 0x07;
         probe_ent->udma_mask    = 0x7f;
 
+        for (i = 0; i < 6; i++)
+                if (!pcim_iomap(pdev, i, 0)) {
+                        dev_printk(KERN_ERR, &pdev->dev,
+                                   "failed to iomap PCI BAR %d\n", i);
+                        return NULL;
+                }
+
         for (i = 0; i < N_PORTS; i++)
                 vt6421_init_addrs(probe_ent, pcim_iomap_table(pdev), i);
 
@@ -522,7 +534,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         if (rc)
                 return rc;
 
-        rc = pcim_iomap_regions(pdev, 0x1f, DRV_NAME);
+        rc = pci_request_regions(pdev, DRV_NAME);
         if (rc) {
                 pcim_pin_device(pdev);
                 return rc;