diff options
Diffstat (limited to 'drivers/scsi/fnic/fnic_main.c')
-rw-r--r-- | drivers/scsi/fnic/fnic_main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c index fc98eb61e760..fbf3ac6e0c55 100644 --- a/drivers/scsi/fnic/fnic_main.c +++ b/drivers/scsi/fnic/fnic_main.c | |||
@@ -399,8 +399,7 @@ static u8 *fnic_get_mac(struct fc_lport *lport) | |||
399 | return fnic->data_src_addr; | 399 | return fnic->data_src_addr; |
400 | } | 400 | } |
401 | 401 | ||
402 | static int __devinit fnic_probe(struct pci_dev *pdev, | 402 | static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
403 | const struct pci_device_id *ent) | ||
404 | { | 403 | { |
405 | struct Scsi_Host *host; | 404 | struct Scsi_Host *host; |
406 | struct fc_lport *lp; | 405 | struct fc_lport *lp; |
@@ -774,7 +773,7 @@ err_out: | |||
774 | return err; | 773 | return err; |
775 | } | 774 | } |
776 | 775 | ||
777 | static void __devexit fnic_remove(struct pci_dev *pdev) | 776 | static void fnic_remove(struct pci_dev *pdev) |
778 | { | 777 | { |
779 | struct fnic *fnic = pci_get_drvdata(pdev); | 778 | struct fnic *fnic = pci_get_drvdata(pdev); |
780 | struct fc_lport *lp = fnic->lport; | 779 | struct fc_lport *lp = fnic->lport; |
@@ -849,7 +848,7 @@ static struct pci_driver fnic_driver = { | |||
849 | .name = DRV_NAME, | 848 | .name = DRV_NAME, |
850 | .id_table = fnic_id_table, | 849 | .id_table = fnic_id_table, |
851 | .probe = fnic_probe, | 850 | .probe = fnic_probe, |
852 | .remove = __devexit_p(fnic_remove), | 851 | .remove = fnic_remove, |
853 | }; | 852 | }; |
854 | 853 | ||
855 | static int __init fnic_init_module(void) | 854 | static int __init fnic_init_module(void) |