Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6a7f62af60fe903e74a8f8d530c2d5bfea1121bb
Commit:     6a7f62af60fe903e74a8f8d530c2d5bfea1121bb
Parent:     942278ef6424c5d661ad0a8202ef60dc0f268a95
Author:     Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Fri Oct 19 00:30:10 2007 +0200
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Fri Oct 19 00:30:10 2007 +0200

    aec62xx: no need to disable UDMA in ->init_hwif method for ATP850UF
    
    * No need to disable UDMA in ->init_hwif method for ATP850UF (and since we
      now always tune PIO it will be disabled by ->set_pio_mode calls anyway).
    
    * Bump driver version.
    
    Acked-by: Sergei Shtylyov <[EMAIL PROTECTED]>
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 drivers/ide/pci/aec62xx.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 3f03ace..be0d077 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/aec62xx.c             Version 0.25    Aug 1, 2007
+ * linux/drivers/ide/pci/aec62xx.c             Version 0.26    Sep 1, 2007
  *
  * Copyright (C) 1999-2002     Andre Hedrick <[EMAIL PROTECTED]>
  * Copyright (C) 2007          MontaVista Software, Inc. <[EMAIL PROTECTED]>
@@ -184,8 +184,6 @@ static unsigned int __devinit init_chipset_aec62xx(struct 
pci_dev *dev, const ch
 static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
 {
        struct pci_dev *dev     = hwif->pci_dev;
-       u8 reg54 = 0,  mask     = hwif->channel ? 0xf0 : 0x0f;
-       unsigned long flags;
 
        hwif->set_pio_mode = &aec_set_pio_mode;
 
@@ -203,12 +201,10 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
 
        hwif->dma_lost_irq      = &aec62xx_dma_lost_irq;
 
-       if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) {
-               spin_lock_irqsave(&ide_lock, flags);
-               pci_read_config_byte (dev, 0x54, &reg54);
-               pci_write_config_byte(dev, 0x54, (reg54 & ~mask));
-               spin_unlock_irqrestore(&ide_lock, flags);
-       } else if (hwif->cbl != ATA_CBL_PATA40_SHORT) {
+       if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF)
+               return;
+
+       if (hwif->cbl != ATA_CBL_PATA40_SHORT) {
                u8 ata66 = 0, mask = hwif->channel ? 0x02 : 0x01;
 
                pci_read_config_byte(hwif->pci_dev, 0x49, &ata66);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to