---

yaml
---
r: 131775
b: refs/heads/master
c: 6be96ac
h: refs/heads/master
i:
  131773: 9ca4999
  131771: c2163a7
  131767: 3b1aaba
  131759: c985c5b
  131743: 236e986
  131711: 0beeec3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ba07d16bd62f931efec1fc8e63bf1aeebfe42a9
+refs/heads/master: 6be96ac15e4d913e1f48299db083ada5321803b2

trunk/drivers/ata/sata_mv.c

@@ -3114,19 +3114,17 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx)
 		writelfl(0, hc_mmio + HC_IRQ_CAUSE_OFS);
 	}
 
-	if (!IS_SOC(hpriv)) {
-		/* Clear any currently outstanding host interrupt conditions */
-		writelfl(0, mmio + hpriv->irq_cause_ofs);
+	/* Clear any currently outstanding host interrupt conditions */
+	writelfl(0, mmio + hpriv->irq_cause_ofs);
 
-		/* and unmask interrupt generation for host regs */
-		writelfl(hpriv->unmask_all_irqs, mmio + hpriv->irq_mask_ofs);
+	/* and unmask interrupt generation for host regs */
+	writelfl(hpriv->unmask_all_irqs, mmio + hpriv->irq_mask_ofs);
 
-		/*
-		 * enable only global host interrupts for now.
-		 * The per-port interrupts get done later as ports are set up.
-		 */
-		mv_set_main_irq_mask(host, 0, PCI_ERR);
-	}
+	/*
+	 * enable only global host interrupts for now.
+	 * The per-port interrupts get done later as ports are set up.
+	 */
+	mv_set_main_irq_mask(host, 0, PCI_ERR);
 done:
 	return rc;
 }