pata_amd: fix sparse warning

Current code is essentially choosing between dividing by 1 or
dividing by two, make the conditions a little more obvious.

As a bonus, removes a sparse error:
drivers/ata/pata_amd.c:59:11: warning: symbol '__x' shadows an earlier one
drivers/ata/pata_amd.c:59:11: originally declared here

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 09c8286b689..33074c34105 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -56,7 +56,9 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offse
         u8 t;
 
         T = 1000000000 / amd_clock;
-        UT = T / min_t(int, max_t(int, clock, 1), 2);
+        UT = T;
+        if (clock >= 2)
+                UT = T / 2;
 
         if (ata_timing_compute(adev, speed, &at, T, UT) < 0) {
                 dev_printk(KERN_ERR, &pdev->dev, "unknown mode %d.\n", speed);