diff options
| author | Tejun Heo <tj@kernel.org> | 2009-01-23 03:31:39 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2009-03-25 03:02:40 +0100 |
| commit | a5bfc4714b3f01365aef89a92673f2ceb1ccf246 (patch) | |
| tree | de2128b74217d3ce6a09af4ee532c561bb022412 /drivers/ata | |
| parent | pata-rb532-cf: drop custom freeze and thaw (diff) | |
| download | linux-a5bfc4714b3f01365aef89a92673f2ceb1ccf246.tar.xz linux-a5bfc4714b3f01365aef89a92673f2ceb1ccf246.zip | |
ahci: drop intx manipulation on msi enable
There's no need to turn off intx explicitly on msi enable. This is
automatically handled by pci. Drop it.
This might be needed on machines if the BIOS turns intx off during
boot. However, there's no evidence of such behavior for ahci and
the only such case seems to be ICH5 PATA according to ata_piix.
Also, given the way ahci operates, it's highly unlikely BIOS ever
disables IRQ for the controller. However, as this change has slight
possibility of introducing failure, please schedule it for #upstream.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/ahci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 66e012cd3271..98d7a9fbb7ed 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -2647,8 +2647,8 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (board_id == board_ahci_sb700 && pdev->revision >= 0x40) hpriv->flags &= ~AHCI_HFLAG_IGN_SERR_INTERNAL; - if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev)) - pci_intx(pdev, 1); + if (!(hpriv->flags & AHCI_HFLAG_NO_MSI)) + pci_enable_msi(pdev); /* save initial config */ ahci_save_initial_config(pdev, hpriv); |