diff options
| author |   Alexander Gordeev <agordeev@redhat.com> | 2014-09-29 18:25:59 +0200 |
|---|---|---|
| committer |   Tejun Heo <tj@kernel.org> | 2014-10-06 11:43:35 -0400 |
| commit | d1028e2f95b75acab4f1046acae1b1ca7d7b2577 (patch) | |
| tree | 6f04701879c51f7fb6fbee6ac588790d2e077efe /drivers/ata/ahci.c | |
| parent | AHCI: Move ahci_host_activate() function to libahci.c (diff) | |
| download | linux-dev-d1028e2f95b75acab4f1046acae1b1ca7d7b2577.tar.xz linux-dev-d1028e2f95b75acab4f1046acae1b1ca7d7b2577.zip | |
AHCI: Move host activation code into ahci_host_activate()
Currently host activation done by calling either function
ahci_host_activate() or ata_host_activate(). Consolidate
the code by only calling ahci_host_activate() for all AHCI
devices.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: linux-ide@vger.kernel.org
Diffstat (limited to 'drivers/ata/ahci.c')
| -rw-r--r-- | drivers/ata/ahci.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 0b2160457046..d0ac38bd2d51 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1427,11 +1427,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) pci_set_master(pdev); - if (hpriv->flags & AHCI_HFLAG_MULTI_MSI) - return ahci_host_activate(host, pdev->irq, &ahci_sht); - - return ata_host_activate(host, pdev->irq, ahci_interrupt, IRQF_SHARED, - &ahci_sht); + return ahci_host_activate(host, pdev->irq, &ahci_sht); } module_pci_driver(ahci_pci_driver); |