]> err.no Git - linux-2.6/commitdiff
libata: pata_pdc2027x PLL detection minor cleanup
authorAlbert Lee <albertcc@tw.ibm.com>
Mon, 20 Aug 2007 08:56:29 +0000 (16:56 +0800)
committerJeff Garzik <jeff@garzik.org>
Fri, 12 Oct 2007 18:55:37 +0000 (14:55 -0400)
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>
drivers/ata/pata_pdc2027x.c

index 40b070ea85a143b18e635632697d7969d0ab442c..2141a99e4da11aa21b611c05585abb353441ffe2 100644 (file)
@@ -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 */