diff options
author | Brett M Russ <russb@emc.com> | 2005-08-15 15:23:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-08 18:07:08 -0400 |
commit | a04ce0ffcaf561994ecf382cd3caad75556dc499 (patch) | |
tree | e891a767810333fe2bf29ddb35f57b0a3ec6e18e /drivers/scsi/ahci.c | |
parent | 3fe9d19f9e86a55679f5f2b38ec0a43a1a510cee (diff) |
[PATCH] PCI/libata INTx cleanup
Simple cleanup to eliminate X copies of the pci_enable_intx() function
in libata. Moved ahci.c's pci_intx() to pci.c and use it throughout
libata and msi.c.
Signed-off-by: Brett Russ <russb@emc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/scsi/ahci.c')
-rw-r--r-- | drivers/scsi/ahci.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c index 320df6cd3def..c2c8fa828e24 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c | |||
@@ -865,22 +865,6 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent) | |||
865 | return 0; | 865 | return 0; |
866 | } | 866 | } |
867 | 867 | ||
868 | /* move to PCI layer, integrate w/ MSI stuff */ | ||
869 | static void pci_intx(struct pci_dev *pdev, int enable) | ||
870 | { | ||
871 | u16 pci_command, new; | ||
872 | |||
873 | pci_read_config_word(pdev, PCI_COMMAND, &pci_command); | ||
874 | |||
875 | if (enable) | ||
876 | new = pci_command & ~PCI_COMMAND_INTX_DISABLE; | ||
877 | else | ||
878 | new = pci_command | PCI_COMMAND_INTX_DISABLE; | ||
879 | |||
880 | if (new != pci_command) | ||
881 | pci_write_config_word(pdev, PCI_COMMAND, pci_command); | ||
882 | } | ||
883 | |||
884 | static void ahci_print_info(struct ata_probe_ent *probe_ent) | 868 | static void ahci_print_info(struct ata_probe_ent *probe_ent) |
885 | { | 869 | { |
886 | struct ahci_host_priv *hpriv = probe_ent->private_data; | 870 | struct ahci_host_priv *hpriv = probe_ent->private_data; |