aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sata_uli.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/sata_uli.c')
-rw-r--r--drivers/scsi/sata_uli.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index 42e13ed8eb5b..4c9fb8b71be1 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -176,18 +176,6 @@ static void uli_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
176 uli_scr_cfg_write(ap, sc_reg, val); 176 uli_scr_cfg_write(ap, sc_reg, val);
177} 177}
178 178
179/* move to PCI layer, integrate w/ MSI stuff */
180static void pci_enable_intx(struct pci_dev *pdev)
181{
182 u16 pci_command;
183
184 pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
185 if (pci_command & PCI_COMMAND_INTX_DISABLE) {
186 pci_command &= ~PCI_COMMAND_INTX_DISABLE;
187 pci_write_config_word(pdev, PCI_COMMAND, pci_command);
188 }
189}
190
191static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 179static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
192{ 180{
193 struct ata_probe_ent *probe_ent; 181 struct ata_probe_ent *probe_ent;
@@ -260,7 +248,7 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
260 } 248 }
261 249
262 pci_set_master(pdev); 250 pci_set_master(pdev);
263 pci_enable_intx(pdev); 251 pci_intx(pdev, 1);
264 252
265 /* FIXME: check ata_device_add return value */ 253 /* FIXME: check ata_device_add return value */
266 ata_device_add(probe_ent); 254 ata_device_add(probe_ent);