diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/pata_pdc2027x.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c index 40b070ea85a1..2141a99e4da1 100644 --- 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) | |||
561 | retry: | 561 | retry: |
562 | bccrl = readl(mmio_base + PDC_BYTE_COUNT) & 0x7fff; | 562 | bccrl = readl(mmio_base + PDC_BYTE_COUNT) & 0x7fff; |
563 | bccrh = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0x7fff; | 563 | bccrh = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0x7fff; |
564 | rmb(); | ||
565 | 564 | ||
566 | /* Read the counter values again for verification */ | 565 | /* Read the counter values again for verification */ |
567 | bccrlv = readl(mmio_base + PDC_BYTE_COUNT) & 0x7fff; | 566 | bccrlv = readl(mmio_base + PDC_BYTE_COUNT) & 0x7fff; |
568 | bccrhv = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0x7fff; | 567 | bccrhv = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0x7fff; |
569 | rmb(); | ||
570 | 568 | ||
571 | counter = (bccrh << 15) | bccrl; | 569 | counter = (bccrh << 15) | bccrl; |
572 | 570 | ||
@@ -741,9 +739,6 @@ static int pdc_hardware_init(struct ata_host *host, unsigned int board_idx) | |||
741 | */ | 739 | */ |
742 | pll_clock = pdc_detect_pll_input_clock(host); | 740 | pll_clock = pdc_detect_pll_input_clock(host); |
743 | 741 | ||
744 | if (pll_clock < 0) /* counter overflow? Try again. */ | ||
745 | pll_clock = pdc_detect_pll_input_clock(host); | ||
746 | |||
747 | dev_printk(KERN_INFO, host->dev, "PLL input clock %ld kHz\n", pll_clock/1000); | 742 | dev_printk(KERN_INFO, host->dev, "PLL input clock %ld kHz\n", pll_clock/1000); |
748 | 743 | ||
749 | /* Adjust PLL control register */ | 744 | /* Adjust PLL control register */ |