10 files changed, 64 insertions, 66 deletions

diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index fcabe46f262b..0f3e659db99a 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -177,11 +177,11 @@ static void ali_program_modes(struct ata_port *ap, struct ata_device *adev, stru
         u8 udma;
 
         if (t != NULL) {
-                t->setup = FIT(t->setup, 1, 8) & 7;
-                t->act8b = FIT(t->act8b, 1, 8) & 7;
-                t->rec8b = FIT(t->rec8b, 1, 16) & 15;
-                t->active = FIT(t->active, 1, 8) & 7;
-                t->recover = FIT(t->recover, 1, 16) & 15;
+                t->setup = clamp_val(t->setup, 1, 8) & 7;
+                t->act8b = clamp_val(t->act8b, 1, 8) & 7;
+                t->rec8b = clamp_val(t->rec8b, 1, 16) & 15;
+                t->active = clamp_val(t->active, 1, 8) & 7;
+                t->recover = clamp_val(t->recover, 1, 16) & 15;
 
                 pci_write_config_byte(pdev, cas, t->setup);
                 pci_write_config_byte(pdev, cbt, (t->act8b << 4) | t->rec8b);
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 26665c396485..57dd00f463d3 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -84,32 +84,32 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offse
 
         /* Configure the address set up timing */
         pci_read_config_byte(pdev, offset + 0x0C, &t);
-        t = (t & ~(3 << ((3 - dn) << 1))) | ((FIT(at.setup, 1, 4) - 1) << ((3 - dn) << 1));
+        t = (t & ~(3 << ((3 - dn) << 1))) | ((clamp_val(at.setup, 1, 4) - 1) << ((3 - dn) << 1));
         pci_write_config_byte(pdev, offset + 0x0C , t);
 
         /* Configure the 8bit I/O timing */
         pci_write_config_byte(pdev, offset + 0x0E + (1 - (dn >> 1)),
-                ((FIT(at.act8b, 1, 16) - 1) << 4) | (FIT(at.rec8b, 1, 16) - 1));
+                ((clamp_val(at.act8b, 1, 16) - 1) << 4) | (clamp_val(at.rec8b, 1, 16) - 1));
 
         /* Drive timing */
         pci_write_config_byte(pdev, offset + 0x08 + (3 - dn),
-                ((FIT(at.active, 1, 16) - 1) << 4) | (FIT(at.recover, 1, 16) - 1));
+                ((clamp_val(at.active, 1, 16) - 1) << 4) | (clamp_val(at.recover, 1, 16) - 1));
 
         switch (clock) {
                 case 1:
-                t = at.udma ? (0xc0 | (FIT(at.udma, 2, 5) - 2)) : 0x03;
+                t = at.udma ? (0xc0 | (clamp_val(at.udma, 2, 5) - 2)) : 0x03;
                 break;
 
                 case 2:
-                t = at.udma ? (0xc0 | amd_cyc2udma[FIT(at.udma, 2, 10)]) : 0x03;
+                t = at.udma ? (0xc0 | amd_cyc2udma[clamp_val(at.udma, 2, 10)]) : 0x03;
                 break;
 
                 case 3:
-                t = at.udma ? (0xc0 | amd_cyc2udma[FIT(at.udma, 1, 10)]) : 0x03;
+                t = at.udma ? (0xc0 | amd_cyc2udma[clamp_val(at.udma, 1, 10)]) : 0x03;
                 break;
 
                 case 4:
-                t = at.udma ? (0xc0 | amd_cyc2udma[FIT(at.udma, 1, 15)]) : 0x03;
+                t = at.udma ? (0xc0 | amd_cyc2udma[clamp_val(at.udma, 1, 15)]) : 0x03;
                 break;
 
                 default:
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index a9c3218e22fd..2ff62608ae37 100644
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -62,14 +62,14 @@ static void cy82c693_set_piomode(struct ata_port *ap, struct ata_device *adev)
                 return;
         }
 
-        time_16 = FIT(t.recover, 0, 15) | (FIT(t.active, 0, 15) << 4);
-        time_8 = FIT(t.act8b, 0, 15) | (FIT(t.rec8b, 0, 15) << 4);
+        time_16 = clamp_val(t.recover, 0, 15) | (clamp_val(t.active, 0, 15) << 4);
+        time_8 = clamp_val(t.act8b, 0, 15) | (clamp_val(t.rec8b, 0, 15) << 4);
 
         if (adev->devno == 0) {
                 pci_read_config_dword(pdev, CY82_IDE_ADDRSETUP, &addr);
 
                 addr &= ~0x0F;  /* Mask bits */
-                addr |= FIT(t.setup, 0, 15);
+                addr |= clamp_val(t.setup, 0, 15);
 
                 pci_write_config_dword(pdev, CY82_IDE_ADDRSETUP, addr);
                 pci_write_config_byte(pdev, CY82_IDE_MASTER_IOR, time_16);
@@ -79,7 +79,7 @@ static void cy82c693_set_piomode(struct ata_port *ap, struct ata_device *adev)
                 pci_read_config_dword(pdev, CY82_IDE_ADDRSETUP, &addr);
 
                 addr &= ~0xF0;  /* Mask bits */
-                addr |= (FIT(t.setup, 0, 15) << 4);
+                addr |= (clamp_val(t.setup, 0, 15) << 4);
 
                 pci_write_config_dword(pdev, CY82_IDE_ADDRSETUP, addr);
                 pci_write_config_byte(pdev, CY82_IDE_SLAVE_IOR, time_16);
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index 7af4b29cc422..fe7cc8ed4ea4 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -343,8 +343,8 @@ static void ht6560a_set_piomode(struct ata_port *ap, struct ata_device *adev)
         /* Get the timing data in cycles. For now play safe at 50Mhz */
         ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000);
 
-        active = FIT(t.active, 2, 15);
-        recover = FIT(t.recover, 4, 15);
+        active = clamp_val(t.active, 2, 15);
+        recover = clamp_val(t.recover, 4, 15);
 
         inb(0x3E6);
         inb(0x3E6);
@@ -377,8 +377,8 @@ static void ht6560b_set_piomode(struct ata_port *ap, struct ata_device *adev)
         /* Get the timing data in cycles. For now play safe at 50Mhz */
         ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000);
 
-        active = FIT(t.active, 2, 15);
-        recover = FIT(t.recover, 2, 16);
+        active = clamp_val(t.active, 2, 15);
+        recover = clamp_val(t.recover, 2, 16);
         recover &= 0x15;
 
         inb(0x3E6);
@@ -462,9 +462,9 @@ static void opti82c611a_set_piomode(struct ata_port *ap,
                 ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP);
         }
 
-        active = FIT(t.active, 2, 17) - 2;
-        recover = FIT(t.recover, 1, 16) - 1;
-        setup = FIT(t.setup, 1, 4) - 1;
+        active = clamp_val(t.active, 2, 17) - 2;
+        recover = clamp_val(t.recover, 1, 16) - 1;
+        setup = clamp_val(t.setup, 1, 4) - 1;
 
         /* Select the right timing bank for write timing */
         rc = ioread8(ap->ioaddr.lbal_addr);
@@ -541,9 +541,9 @@ static void opti82c46x_set_piomode(struct ata_port *ap, struct ata_device *adev)
                 ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP);
         }
 
-        active = FIT(t.active, 2, 17) - 2;
-        recover = FIT(t.recover, 1, 16) - 1;
-        setup = FIT(t.setup, 1, 4) - 1;
+        active = clamp_val(t.active, 2, 17) - 2;
+        recover = clamp_val(t.recover, 1, 16) - 1;
+        setup = clamp_val(t.setup, 1, 4) - 1;
 
         /* Select the right timing bank for write timing */
         rc = ioread8(ap->ioaddr.lbal_addr);
@@ -624,11 +624,11 @@ static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev)
         ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
 
         if (ld_qdi->fast) {
-                active = 8 - FIT(t.active, 1, 8);
-                recovery = 18 - FIT(t.recover, 3, 18);
+                active = 8 - clamp_val(t.active, 1, 8);
+                recovery = 18 - clamp_val(t.recover, 3, 18);
         } else {
-                active = 9 - FIT(t.active, 2, 9);
-                recovery = 15 - FIT(t.recover, 0, 15);
+                active = 9 - clamp_val(t.active, 2, 9);
+                recovery = 15 - clamp_val(t.recover, 0, 15);
         }
         timing = (recovery << 4) | active | 0x08;
 
@@ -658,11 +658,11 @@ static void qdi6580dp_set_piomode(struct ata_port *ap, struct ata_device *adev)
         ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
 
         if (ld_qdi->fast) {
-                active = 8 - FIT(t.active, 1, 8);
-                recovery = 18 - FIT(t.recover, 3, 18);
+                active = 8 - clamp_val(t.active, 1, 8);
+                recovery = 18 - clamp_val(t.recover, 3, 18);
         } else {
-                active = 9 - FIT(t.active, 2, 9);
-                recovery = 15 - FIT(t.recover, 0, 15);
+                active = 9 - clamp_val(t.active, 2, 9);
+                recovery = 15 - clamp_val(t.recover, 0, 15);
         }
         timing = (recovery << 4) | active | 0x08;
 
@@ -695,11 +695,11 @@ static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev)
         ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
 
         if (ld_qdi->fast) {
-                active = 8 - FIT(t.active, 1, 8);
-                recovery = 18 - FIT(t.recover, 3, 18);
+                active = 8 - clamp_val(t.active, 1, 8);
+                recovery = 18 - clamp_val(t.recover, 3, 18);
         } else {
-                active = 9 - FIT(t.active, 2, 9);
-                recovery = 15 - FIT(t.recover, 0, 15);
+                active = 9 - clamp_val(t.active, 2, 9);
+                recovery = 15 - clamp_val(t.recover, 0, 15);
         }
         timing = (recovery << 4) | active | 0x08;
         ld_qdi->clock[adev->devno] = timing;
@@ -830,8 +830,8 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
         else
                 ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
 
-        active = (FIT(t.active, 3, 17) - 1) & 0x0F;
-        recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F;
+        active = (clamp_val(t.active, 3, 17) - 1) & 0x0F;
+        recovery = (clamp_val(t.recover, 1, 15) + 1) & 0x0F;
         timing = (active << 4) | recovery;
         winbond_writecfg(ld_winbond->timing, timing, reg);
 
@@ -842,7 +842,7 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
                 reg |= 0x08;    /* FIFO off */
         if (!ata_pio_need_iordy(adev))
                 reg |= 0x02;    /* IORDY off */
-        reg |= (FIT(t.setup, 0, 3) << 6);
+        reg |= (clamp_val(t.setup, 0, 3) << 6);
         winbond_writecfg(ld_winbond->timing, timing + 1, reg);
 }
 
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index 76d2455bc453..be756b7ef07e 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -91,9 +91,9 @@ static void ns87410_set_piomode(struct ata_port *ap, struct ata_device *adev)
                 return;
         }
 
-        at.active = FIT(at.active, 2, 16) - 2;
-        at.setup = FIT(at.setup, 1, 4) - 1;
-        at.recover = FIT(at.recover, 1, 12) - 1;
+        at.active = clamp_val(at.active, 2, 16) - 2;
+        at.setup = clamp_val(at.setup, 1, 4) - 1;
+        at.recover = clamp_val(at.recover, 1, 12) - 1;
 
         idetcr = (at.setup << 6) | (recoverbits[at.recover] << 3) | activebits[at.active];
 
diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c
index ae92b0049bd5..e0aa7eaaee0a 100644
--- a/drivers/ata/pata_ns87415.c
+++ b/drivers/ata/pata_ns87415.c
@@ -66,8 +66,8 @@ static void ns87415_set_mode(struct ata_port *ap, struct ata_device *adev, u8 mo
 
         ata_timing_compute(adev, adev->pio_mode, &t, T, 0);
 
-        clocking = 17 - FIT(t.active, 2, 17);
-        clocking |= (16 - FIT(t.recover, 1, 16)) << 4;
+        clocking = 17 - clamp_val(t.active, 2, 17);
+        clocking |= (16 - clamp_val(t.recover, 1, 16)) << 4;
         /* Use the same timing for read and write bytes */
         clocking |= (clocking << 8);
         pci_write_config_word(dev, timing, clocking);
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index bf45cf017753..97e5b090d7c2 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -60,11 +60,11 @@ static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev)
         ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
 
         if (qdi->fast) {
-                active = 8 - FIT(t.active, 1, 8);
-                recovery = 18 - FIT(t.recover, 3, 18);
+                active = 8 - clamp_val(t.active, 1, 8);
+                recovery = 18 - clamp_val(t.recover, 3, 18);
         } else {
-                active = 9 - FIT(t.active, 2, 9);
-                recovery = 15 - FIT(t.recover, 0, 15);
+                active = 9 - clamp_val(t.active, 2, 9);
+                recovery = 15 - clamp_val(t.recover, 0, 15);
         }
         timing = (recovery << 4) | active | 0x08;
 
@@ -84,11 +84,11 @@ static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev)
         ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
 
         if (qdi->fast) {
-                active = 8 - FIT(t.active, 1, 8);
-                recovery = 18 - FIT(t.recover, 3, 18);
+                active = 8 - clamp_val(t.active, 1, 8);
+                recovery = 18 - clamp_val(t.recover, 3, 18);
         } else {
-                active = 9 - FIT(t.active, 2, 9);
-                recovery = 15 - FIT(t.recover, 0, 15);
+                active = 9 - clamp_val(t.active, 2, 9);
+                recovery = 15 - clamp_val(t.recover, 0, 15);
         }
         timing = (recovery << 4) | active | 0x08;
 
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 2fea6cbe7755..708ed144ede9 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -259,15 +259,15 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
 
                 pci_read_config_byte(pdev, 0x4C, &setup);
                 setup &= ~(3 << shift);
-                setup |= FIT(t.setup, 1, 4) << shift;   /* 1,4 or 1,4 - 1  FIXME */
+                setup |= clamp_val(t.setup, 1, 4) << shift;     /* 1,4 or 1,4 - 1  FIXME */
                 pci_write_config_byte(pdev, 0x4C, setup);
         }
 
         /* Load the PIO mode bits */
         pci_write_config_byte(pdev, 0x4F - ap->port_no,
-                ((FIT(t.act8b, 1, 16) - 1) << 4) | (FIT(t.rec8b, 1, 16) - 1));
+                ((clamp_val(t.act8b, 1, 16) - 1) << 4) | (clamp_val(t.rec8b, 1, 16) - 1));
         pci_write_config_byte(pdev, 0x48 + offset,
-                ((FIT(t.active, 1, 16) - 1) << 4) | (FIT(t.recover, 1, 16) - 1));
+                ((clamp_val(t.active, 1, 16) - 1) << 4) | (clamp_val(t.recover, 1, 16) - 1));
 
         /* Load the UDMA bits according to type */
         switch(udma_type) {
@@ -275,16 +275,16 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
                         /* BUG() ? */
                         /* fall through */
                 case 33:
-                        ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 5) - 2)) : 0x03;
+                        ut = t.udma ? (0xe0 | (clamp_val(t.udma, 2, 5) - 2)) : 0x03;
                         break;
                 case 66:
-                        ut = t.udma ? (0xe8 | (FIT(t.udma, 2, 9) - 2)) : 0x0f;
+                        ut = t.udma ? (0xe8 | (clamp_val(t.udma, 2, 9) - 2)) : 0x0f;
                         break;
                 case 100:
-                        ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07;
+                        ut = t.udma ? (0xe0 | (clamp_val(t.udma, 2, 9) - 2)) : 0x07;
                         break;
                 case 133:
-                        ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07;
+                        ut = t.udma ? (0xe0 | (clamp_val(t.udma, 2, 9) - 2)) : 0x07;
                         break;
         }
 
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index 6e52a3573fbf..474528f8fe3d 100644
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -75,8 +75,8 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
         else
                 ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
 
-        active = (FIT(t.active, 3, 17) - 1) & 0x0F;
-        recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F;
+        active = (clamp_val(t.active, 3, 17) - 1) & 0x0F;
+        recovery = (clamp_val(t.recover, 1, 15) + 1) & 0x0F;
         timing = (active << 4) | recovery;
         winbond_writecfg(winbond->config, timing, reg);
 
@@ -87,7 +87,7 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
                 reg |= 0x08;    /* FIFO off */
         if (!ata_pio_need_iordy(adev))
                 reg |= 0x02;    /* IORDY off */
-        reg |= (FIT(t.setup, 0, 3) << 6);
+        reg |= (clamp_val(t.setup, 0, 3) << 6);
         winbond_writecfg(winbond->config, timing + 1, reg);
 }
 
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 0f17643e0a6e..07ec193fc941 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -821,8 +821,6 @@ struct ata_timing {
         unsigned short udma;            /* t2CYCTYP/2 */
 };
 
-#define FIT(v, vmin, vmax)      max_t(short, min_t(short, v, vmax), vmin)
-
 /*
  * Core layer - drivers/ata/libata-core.c
  */