Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 16 insertions, 4 deletions

diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index d3190d7ec304..118787caa93f 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -11,7 +11,7 @@
  *
  *  May be copied or modified under the terms of the GNU General Public License
  *
- *  Documentation publically available.
+ *  Documentation publicly available.
  *
  *      If you have strange problems with nVidia chipset systems please
  *      see the SI support documentation and update your system BIOS
@@ -43,7 +43,7 @@
  *
  *      Turn a config register offset into the right address in either
  *      PCI space or MMIO space to access the control register in question
- *      Thankfully this is a configuration operation so isnt performance
+ *      Thankfully this is a configuration operation so isn't performance
  *      criticial.
  */
 
@@ -202,14 +202,25 @@ static void sil680_set_dmamode(struct ata_port *ap, struct ata_device *adev)
  *      LOCKING:
  *      spin_lock_irqsave(host lock)
  */
-void sil680_sff_exec_command(struct ata_port *ap,
-                                        const struct ata_taskfile *tf)
+static void sil680_sff_exec_command(struct ata_port *ap,
+                                    const struct ata_taskfile *tf)
 {
         DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command);
         iowrite8(tf->command, ap->ioaddr.command_addr);
         ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_CMD);
 }
 
+static bool sil680_sff_irq_check(struct ata_port *ap)
+{
+        struct pci_dev *pdev    = to_pci_dev(ap->host->dev);
+        unsigned long addr      = sil680_selreg(ap, 1);
+        u8 val;
+
+        pci_read_config_byte(pdev, addr, &val);
+
+        return val & 0x08;
+}
+
 static struct scsi_host_template sil680_sht = {
         ATA_BMDMA_SHT(DRV_NAME),
 };
@@ -218,6 +229,7 @@ static struct scsi_host_template sil680_sht = {
 static struct ata_port_operations sil680_port_ops = {
         .inherits               = &ata_bmdma32_port_ops,
         .sff_exec_command       = sil680_sff_exec_command,
+        .sff_irq_check          = sil680_sff_irq_check,
         .cable_detect           = sil680_cable_detect,
         .set_piomode            = sil680_set_piomode,
         .set_dmamode            = sil680_set_dmamode,