From 8399f9327f6d5f275fdd807b337e9043eda9ecda Mon Sep 17 00:00:00 2001 From: Albert Lee Date: Mon, 20 Aug 2007 16:56:29 +0800 Subject: [PATCH] --- yaml --- r: 68086 b: refs/heads/master c: e923090ddd9fef1d4e06dc6c5295e29baced19f3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_pdc2027x.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5eeaf4b2c74e..ab292be4421c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7293870a93a99e9ce0f4d98f3a271539c7c6ad6 +refs/heads/master: e923090ddd9fef1d4e06dc6c5295e29baced19f3 diff --git a/trunk/drivers/ata/pata_pdc2027x.c b/trunk/drivers/ata/pata_pdc2027x.c index 40b070ea85a1..2141a99e4da1 100644 --- a/trunk/drivers/ata/pata_pdc2027x.c +++ b/trunk/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 */