From: Tejun Heo <tj@kernel.org>
Date: Wed, 5 Jun 2013 02:49:57 +0000 (-0700)
Subject: Merge branch 'for-3.10-fixes' into for-next
X-Git-Tag: next-20130607~75^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=17039efb836eca349c6533bb5854fdb7a02a5cd3;p=karo-tx-linux.git

Merge branch 'for-3.10-fixes' into for-next

Conflicts:
	drivers/ata/sata_rcar.c
---

17039efb836eca349c6533bb5854fdb7a02a5cd3
diff --cc drivers/ata/sata_rcar.c
index f0d3e43570ee,d51423463479..8108eb065444
--- a/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];