Merge branch 'upstream' into pata-drivers

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 3f1106fdaed1..1aabc81d82f1 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1075,7 +1075,7 @@ static void ahci_host_intr(struct ata_port *ap)
                 return;
 
         /* ignore interim PIO setup fis interrupts */
-        if (ata_tag_valid(ap->active_tag) && (status & PORT_IRQ_PIOS_FIS)) 
+        if (ata_tag_valid(ap->active_tag) && (status & PORT_IRQ_PIOS_FIS))
                 return;
 
         if (ata_ratelimit())
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 912211ada816..0e23ecb77bc2 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -497,7 +497,7 @@ static inline unsigned int adma_intr_mmio(struct ata_host *host)
                                         continue;
                                 DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
                                         ap->id, qc->tf.protocol, status);
-                
+
                                 /* complete taskfile transaction */
                                 pp->state = adma_state_idle;
                                 qc->err_mask |= ac_err_mask(status);