|
@@ -1,5 +1,5 @@
|
|
/*
|
|
/*
|
|
- * linux/drivers/ide/pci/cs5530.c Version 0.76 Aug 3 2007
|
|
|
|
|
|
+ * linux/drivers/ide/pci/cs5530.c Version 0.77 Sep 24 2007
|
|
*
|
|
*
|
|
* Copyright (C) 2000 Andre Hedrick <andre@linux-ide.org>
|
|
* Copyright (C) 2000 Andre Hedrick <andre@linux-ide.org>
|
|
* Copyright (C) 2000 Mark Lord <mlord@pobox.com>
|
|
* Copyright (C) 2000 Mark Lord <mlord@pobox.com>
|
|
@@ -146,7 +146,6 @@ static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode)
|
|
static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const char *name)
|
|
static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const char *name)
|
|
{
|
|
{
|
|
struct pci_dev *master_0 = NULL, *cs5530_0 = NULL;
|
|
struct pci_dev *master_0 = NULL, *cs5530_0 = NULL;
|
|
- unsigned long flags;
|
|
|
|
|
|
|
|
if (pci_resource_start(dev, 4) == 0)
|
|
if (pci_resource_start(dev, 4) == 0)
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
@@ -171,9 +170,6 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
- spin_lock_irqsave(&ide_lock, flags);
|
|
|
|
- /* all CPUs (there should only be one CPU with this chipset) */
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* Enable BusMaster and MemoryWriteAndInvalidate for the cs5530:
|
|
* Enable BusMaster and MemoryWriteAndInvalidate for the cs5530:
|
|
* --> OR 0x14 into 16-bit PCI COMMAND reg of function 0 of the cs5530
|
|
* --> OR 0x14 into 16-bit PCI COMMAND reg of function 0 of the cs5530
|
|
@@ -224,8 +220,6 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch
|
|
pci_write_config_byte(master_0, 0x42, 0x00);
|
|
pci_write_config_byte(master_0, 0x42, 0x00);
|
|
pci_write_config_byte(master_0, 0x43, 0xc1);
|
|
pci_write_config_byte(master_0, 0x43, 0xc1);
|
|
|
|
|
|
- spin_unlock_irqrestore(&ide_lock, flags);
|
|
|
|
-
|
|
|
|
out:
|
|
out:
|
|
pci_dev_put(master_0);
|
|
pci_dev_put(master_0);
|
|
pci_dev_put(cs5530_0);
|
|
pci_dev_put(cs5530_0);
|