libata: pata_pdc2027x PLL detection minor cleanup

Minor cleanup to remove the unneeded rmb()s per Jeff's advice. Also removed the
pll_clock < 0 check since pll_clock now guaranteed to be >= 0 after Mikael's patch.

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index 40b070e..2141a99 100644 (file)
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -561,12 +561,10 @@ static long pdc_read_counter(struct ata_host *host)
 retry:
        bccrl = readl(mmio_base + PDC_BYTE_COUNT) & 0x7fff;
        bccrh = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0x7fff;
-       rmb();
 
        /* Read the counter values again for verification */
        bccrlv = readl(mmio_base + PDC_BYTE_COUNT) & 0x7fff;
        bccrhv = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0x7fff;
-       rmb();
 
        counter = (bccrh << 15) | bccrl;
 
@@ -741,9 +739,6 @@ static int pdc_hardware_init(struct ata_host *host, unsigned int board_idx)
         */
        pll_clock = pdc_detect_pll_input_clock(host);
 
-       if (pll_clock < 0) /* counter overflow? Try again. */
-               pll_clock = pdc_detect_pll_input_clock(host);
-
        dev_printk(KERN_INFO, host->dev, "PLL input clock %ld kHz\n", pll_clock/1000);
 
        /* Adjust PLL control register */