aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ata_piix.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/ata_piix.c')
-rw-r--r--drivers/scsi/ata_piix.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 5f8688529041..87e0c36f1554 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -568,18 +568,6 @@ static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev)
568 } 568 }
569} 569}
570 570
571/* move to PCI layer, integrate w/ MSI stuff */
572static void pci_enable_intx(struct pci_dev *pdev)
573{
574 u16 pci_command;
575
576 pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
577 if (pci_command & PCI_COMMAND_INTX_DISABLE) {
578 pci_command &= ~PCI_COMMAND_INTX_DISABLE;
579 pci_write_config_word(pdev, PCI_COMMAND, pci_command);
580 }
581}
582
583#define AHCI_PCI_BAR 5 571#define AHCI_PCI_BAR 5
584#define AHCI_GLOBAL_CTL 0x04 572#define AHCI_GLOBAL_CTL 0x04
585#define AHCI_ENABLE (1 << 31) 573#define AHCI_ENABLE (1 << 31)
@@ -677,7 +665,7 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
677 * message-signalled interrupts currently). 665 * message-signalled interrupts currently).
678 */ 666 */
679 if (port_info[0]->host_flags & PIIX_FLAG_CHECKINTR) 667 if (port_info[0]->host_flags & PIIX_FLAG_CHECKINTR)
680 pci_enable_intx(pdev); 668 pci_intx(pdev, 1);
681 669
682 if (combined) { 670 if (combined) {
683 port_info[sata_chan] = &piix_port_info[ent->driver_data]; 671 port_info[sata_chan] = &piix_port_info[ent->driver_data];