hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: mpt: Move scsi_remove_host() out of mptscsih_remove_host() 

Commit c5ce0abeb6 ("scsi: sas: move scsi_remove_host call...")  moved
the call to scsi_remove_host() into sas_remove_host(), but forgot to
modify the mpt drivers.

Fixes: c5ce0abeb6 ("scsi: sas: move scsi_remove_host call into sas_remove_host")
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Hannes Reinecke 2017-04-24 11:22:32 +02:00 committed by Martin K. Petersen
parent e791ce27c3
commit cfd2aff711
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/message/fusion/mptfc.c
View File

@ -1329,7 +1329,7 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
WQ_MEM_RECLAIM); WQ_MEM_RECLAIM);
if (!ioc->fc_rescan_work_q) { if (!ioc->fc_rescan_work_q) {
error = -ENOMEM; error = -ENOMEM;
goto out_mptfc_probe; goto out_mptfc_host;
} }
/* /*
@ -1351,6 +1351,9 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return 0; return 0;
out_mptfc_host:
scsi_remove_host(sh);
out_mptfc_probe: out_mptfc_probe:
mptscsih_remove(pdev); mptscsih_remove(pdev);
@ -1530,6 +1533,8 @@ static void mptfc_remove(struct pci_dev *pdev)
} }
} }
scsi_remove_host(ioc->sh);
mptscsih_remove(pdev); mptscsih_remove(pdev);
} }

2
drivers/message/fusion/mptscsih.c
View File

@ -1176,8 +1176,6 @@ mptscsih_remove(struct pci_dev *pdev)
MPT_SCSI_HOST *hd; MPT_SCSI_HOST *hd;
int sz1; int sz1;
scsi_remove_host(host);
if((hd = shost_priv(host)) == NULL) if((hd = shost_priv(host)) == NULL)
return; return;

10
drivers/message/fusion/mptspi.c
View File

@ -1548,11 +1548,19 @@ out_mptspi_probe:
return error; return error;
} }
static void mptspi_remove(struct pci_dev *pdev)
{
MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
scsi_remove_host(ioc->sh);
mptscsih_remove(pdev);
}
static struct pci_driver mptspi_driver = { static struct pci_driver mptspi_driver = {
.name = "mptspi", .name = "mptspi",
.id_table = mptspi_pci_table, .id_table = mptspi_pci_table,
.probe = mptspi_probe, .probe = mptspi_probe,
.remove = mptscsih_remove, .remove = mptspi_remove,
.shutdown = mptscsih_shutdown, .shutdown = mptscsih_shutdown,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = mptscsih_suspend, .suspend = mptscsih_suspend,