diff options
Diffstat (limited to 'drivers/message/fusion/mptfc.c')
-rw-r--r-- | drivers/message/fusion/mptfc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c index d784c36707c0..c13cd9bc590b 100644 --- a/drivers/message/fusion/mptfc.c +++ b/drivers/message/fusion/mptfc.c | |||
@@ -100,7 +100,7 @@ static int mptfc_slave_alloc(struct scsi_device *sdev); | |||
100 | static int mptfc_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt); | 100 | static int mptfc_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt); |
101 | static void mptfc_target_destroy(struct scsi_target *starget); | 101 | static void mptfc_target_destroy(struct scsi_target *starget); |
102 | static void mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout); | 102 | static void mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout); |
103 | static void __devexit mptfc_remove(struct pci_dev *pdev); | 103 | static void mptfc_remove(struct pci_dev *pdev); |
104 | static int mptfc_abort(struct scsi_cmnd *SCpnt); | 104 | static int mptfc_abort(struct scsi_cmnd *SCpnt); |
105 | static int mptfc_dev_reset(struct scsi_cmnd *SCpnt); | 105 | static int mptfc_dev_reset(struct scsi_cmnd *SCpnt); |
106 | static int mptfc_bus_reset(struct scsi_cmnd *SCpnt); | 106 | static int mptfc_bus_reset(struct scsi_cmnd *SCpnt); |
@@ -1360,7 +1360,7 @@ static struct pci_driver mptfc_driver = { | |||
1360 | .name = "mptfc", | 1360 | .name = "mptfc", |
1361 | .id_table = mptfc_pci_table, | 1361 | .id_table = mptfc_pci_table, |
1362 | .probe = mptfc_probe, | 1362 | .probe = mptfc_probe, |
1363 | .remove = __devexit_p(mptfc_remove), | 1363 | .remove = mptfc_remove, |
1364 | .shutdown = mptscsih_shutdown, | 1364 | .shutdown = mptscsih_shutdown, |
1365 | #ifdef CONFIG_PM | 1365 | #ifdef CONFIG_PM |
1366 | .suspend = mptscsih_suspend, | 1366 | .suspend = mptscsih_suspend, |
@@ -1496,8 +1496,7 @@ mptfc_init(void) | |||
1496 | * @pdev: Pointer to pci_dev structure | 1496 | * @pdev: Pointer to pci_dev structure |
1497 | * | 1497 | * |
1498 | */ | 1498 | */ |
1499 | static void __devexit | 1499 | static void mptfc_remove(struct pci_dev *pdev) |
1500 | mptfc_remove(struct pci_dev *pdev) | ||
1501 | { | 1500 | { |
1502 | MPT_ADAPTER *ioc = pci_get_drvdata(pdev); | 1501 | MPT_ADAPTER *ioc = pci_get_drvdata(pdev); |
1503 | struct mptfc_rport_info *p, *n; | 1502 | struct mptfc_rport_info *p, *n; |