Merge branch 'upstream' into pata-drivers

drivers/ata/ahci.c

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 3f1106f..1aabc81 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1075,7 +1075,7 @@
 		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())

drivers/ata/pdc_adma.c

diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 912211a..0e23ecb 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -497,7 +497,7 @@
 					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);

include/linux/ata.h

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 991b858..d894419 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -320,8 +320,8 @@
 
 static inline int ata_id_current_chs_valid(const u16 *id)
 {
-	/* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command 
-	   has not been issued to the device then the values of 
+	/* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
+	   has not been issued to the device then the values of
 	   id[54] to id[56] are vendor specific. */
 	return (id[53] & 0x01) && /* Current translation valid */
 		id[54] &&  /* cylinders in current translation */

include/linux/libata.h

diff --git a/include/linux/libata.h b/include/linux/libata.h
index a6d818148..8715305f 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -198,7 +198,7 @@
 
 	/* host set flags */
 	ATA_HOST_SIMPLEX	= (1 << 0),	/* Host is simplex, one DMA channel per host only */
-	
+
 	/* various lengths of time */
 	ATA_TMOUT_BOOT		= 30 * HZ,	/* heuristic */
 	ATA_TMOUT_BOOT_QUICK	= 7 * HZ,	/* heuristic */