Merge branch 'libata/for-3.10-fixes' into libata/for-3.11

libata/for-3.10-fixes never got submitted during v3.10 cycle.  Merge
it into for-3.11 so that it can be routed together with other changes
scheduled for v3.11.

Three trivial conflicts in drivers/ata/sata_rcar.c.  All are caused by
1b20f6a9ad ("sata_rcar: add 'base' local variable to some functions")
conflicting with logic updates in for-3.10-fixes.  The offending
commit simply adds local variable @base on functions which
dereferences sata_rcar_priv->base multiple times.  The resolutions are
trivial - applying s/priv->base/base/ in the conflicting logic
updates.

Signed-off-by: Tejun Heo <tj@kernel.org>

diff --cc drivers/ata/acard-ahci.c
Simple merge

diff --cc drivers/ata/ahci.c
Simple merge

diff --cc drivers/ata/ahci.h
Simple merge

diff --cc drivers/ata/ata_piix.c
Simple merge

diff --cc drivers/ata/libahci.c
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/ata/libata-scsi.c
Simple merge

diff --cc drivers/ata/sata_highbank.c
Simple merge

diff --cc drivers/ata/sata_rcar.c
index f0d3e43570eebc599c55bff858a13f32cc6d14f4,d51423463479f883cd819ca50b9a1ecd05dc0fc6..8108eb0654448f8eba16da40e4aace400ff8087a
--- 1/drivers/ata/sata_rcar.c
--- 2/drivers/ata/sata_rcar.c
+++ b/drivers/ata/sata_rcar.c
@@@ -183,10 -178,9 +183,10 @@@ static void sata_rcar_freeze(struct ata
  static void sata_rcar_thaw(struct ata_port *ap)
  {
        struct sata_rcar_priv *priv = ap->host->private_data;
 +      void __iomem *base = priv->base;
  
        /* ack */
-       iowrite32(~SATA_RCAR_INT_MASK, base + SATAINTSTAT_REG);
 -      iowrite32(~(u32)SATA_RCAR_INT_MASK, priv->base + SATAINTSTAT_REG);
++      iowrite32(~(u32)SATA_RCAR_INT_MASK, base + SATAINTSTAT_REG);
  
        ata_sff_thaw(ap);
  
@@@ -539,14 -544,14 +539,15 @@@ static void sata_rcar_bmdma_setup(struc
  static void sata_rcar_bmdma_start(struct ata_queued_cmd *qc)
  {
        struct ata_port *ap = qc->ap;
 -      u32 dmactl;
        struct sata_rcar_priv *priv = ap->host->private_data;
 +      void __iomem *base = priv->base;
 +      u32 dmactl;
  
        /* start host DMA transaction */
 -      dmactl = ioread32(priv->base + ATAPI_CONTROL1_REG);
 +      dmactl = ioread32(base + ATAPI_CONTROL1_REG);
+       dmactl &= ~ATAPI_CONTROL1_STOP;
        dmactl |= ATAPI_CONTROL1_START;
 -      iowrite32(dmactl, priv->base + ATAPI_CONTROL1_REG);
 +      iowrite32(dmactl, base + ATAPI_CONTROL1_REG);
  }
  
  static void sata_rcar_bmdma_stop(struct ata_queued_cmd *qc)
@@@ -681,11 -675,12 +680,12 @@@ static irqreturn_t sata_rcar_interrupt(
  
        spin_lock_irqsave(&host->lock, flags);
  
 -      sataintstat = ioread32(priv->base + SATAINTSTAT_REG);
 +      sataintstat = ioread32(base + SATAINTSTAT_REG);
+       sataintstat &= SATA_RCAR_INT_MASK;
        if (!sataintstat)
                goto done;
        /* ack */
-       iowrite32(sataintstat & ~SATA_RCAR_INT_MASK, base + SATAINTSTAT_REG);
 -      iowrite32(~sataintstat & 0x7ff, priv->base + SATAINTSTAT_REG);
++      iowrite32(~sataintstat & 0x7ff, base + SATAINTSTAT_REG);
  
        ap = host->ports[0];
  

diff --cc drivers/ata/sata_sil.c
Simple merge