lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[libata] ahci: Update for recent ->host_stop() API change

Browse Source
This commit is contained in:
Jeff Garzik
2005-05-31 11:53:57 -04:00
parent edb3e182b6
commit ead5de996f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/scsi/ahci.c
View File

@@ -39,7 +39,7 @@
#include <asm/io.h> #include <asm/io.h>
#define DRV_NAME "ahci" #define DRV_NAME "ahci"
#define DRV_VERSION "1.00" #define DRV_VERSION "1.01"
enum { enum {
@@ -1086,8 +1086,6 @@ static void ahci_remove_one (struct pci_dev *pdev)
have_msi = hpriv->have_msi; have_msi = hpriv->have_msi;
free_irq(host_set->irq, host_set); free_irq(host_set->irq, host_set);
host_set->ops->host_stop(host_set);
iounmap(host_set->mmio_base);
for (i = 0; i < host_set->n_ports; i++) { for (i = 0; i < host_set->n_ports; i++) {
ap = host_set->ports[i]; ap = host_set->ports[i];
@@ -1096,12 +1094,14 @@ static void ahci_remove_one (struct pci_dev *pdev)
scsi_host_put(ap->host); scsi_host_put(ap->host);
} }
host_set->ops->host_stop(host_set);
kfree(host_set);
if (have_msi) if (have_msi)
pci_disable_msi(pdev); pci_disable_msi(pdev);
else else
pci_intx(pdev, 0); pci_intx(pdev, 0);
pci_release_regions(pdev); pci_release_regions(pdev);
kfree(host_set);
pci_disable_device(pdev); pci_disable_device(pdev);
dev_set_drvdata(dev, NULL); dev_set_drvdata(dev, NULL);
} }