diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 16:08:55 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:01 -0500 |
commit | 6f039790510fd630ff348efe8c4802dbaa041fba (patch) | |
tree | bf99ab35c78f689a40f3057537209be5f7ca88d6 /drivers/scsi/lpfc/lpfc_init.c | |
parent | 48c68c4f1b542444f175a9e136febcecf3e704d8 (diff) |
Drivers: scsi: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.
This change removes the use of __devinit, __devexit_p, __devinitdata,
__devinitconst, and __devexit from these drivers.
Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Adam Radford <linuxraid@lsi.com>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_init.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_init.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index c20eec78adc1..89ad55807012 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c | |||
@@ -8813,7 +8813,7 @@ lpfc_get_sli4_parameters(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) | |||
8813 | * 0 - driver can claim the device | 8813 | * 0 - driver can claim the device |
8814 | * negative value - driver can not claim the device | 8814 | * negative value - driver can not claim the device |
8815 | **/ | 8815 | **/ |
8816 | static int __devinit | 8816 | static int |
8817 | lpfc_pci_probe_one_s3(struct pci_dev *pdev, const struct pci_device_id *pid) | 8817 | lpfc_pci_probe_one_s3(struct pci_dev *pdev, const struct pci_device_id *pid) |
8818 | { | 8818 | { |
8819 | struct lpfc_hba *phba; | 8819 | struct lpfc_hba *phba; |
@@ -8980,7 +8980,7 @@ out_free_phba: | |||
8980 | * removed from PCI bus, it performs all the necessary cleanup for the HBA | 8980 | * removed from PCI bus, it performs all the necessary cleanup for the HBA |
8981 | * device to be removed from the PCI subsystem properly. | 8981 | * device to be removed from the PCI subsystem properly. |
8982 | **/ | 8982 | **/ |
8983 | static void __devexit | 8983 | static void |
8984 | lpfc_pci_remove_one_s3(struct pci_dev *pdev) | 8984 | lpfc_pci_remove_one_s3(struct pci_dev *pdev) |
8985 | { | 8985 | { |
8986 | struct Scsi_Host *shost = pci_get_drvdata(pdev); | 8986 | struct Scsi_Host *shost = pci_get_drvdata(pdev); |
@@ -9587,7 +9587,7 @@ lpfc_sli4_request_firmware_update(struct lpfc_hba *phba, uint8_t fw_upgrade) | |||
9587 | * 0 - driver can claim the device | 9587 | * 0 - driver can claim the device |
9588 | * negative value - driver can not claim the device | 9588 | * negative value - driver can not claim the device |
9589 | **/ | 9589 | **/ |
9590 | static int __devinit | 9590 | static int |
9591 | lpfc_pci_probe_one_s4(struct pci_dev *pdev, const struct pci_device_id *pid) | 9591 | lpfc_pci_probe_one_s4(struct pci_dev *pdev, const struct pci_device_id *pid) |
9592 | { | 9592 | { |
9593 | struct lpfc_hba *phba; | 9593 | struct lpfc_hba *phba; |
@@ -9779,7 +9779,7 @@ out_free_phba: | |||
9779 | * removed from PCI bus, it performs all the necessary cleanup for the HBA | 9779 | * removed from PCI bus, it performs all the necessary cleanup for the HBA |
9780 | * device to be removed from the PCI subsystem properly. | 9780 | * device to be removed from the PCI subsystem properly. |
9781 | **/ | 9781 | **/ |
9782 | static void __devexit | 9782 | static void |
9783 | lpfc_pci_remove_one_s4(struct pci_dev *pdev) | 9783 | lpfc_pci_remove_one_s4(struct pci_dev *pdev) |
9784 | { | 9784 | { |
9785 | struct Scsi_Host *shost = pci_get_drvdata(pdev); | 9785 | struct Scsi_Host *shost = pci_get_drvdata(pdev); |
@@ -10205,7 +10205,7 @@ lpfc_io_resume_s4(struct pci_dev *pdev) | |||
10205 | * 0 - driver can claim the device | 10205 | * 0 - driver can claim the device |
10206 | * negative value - driver can not claim the device | 10206 | * negative value - driver can not claim the device |
10207 | **/ | 10207 | **/ |
10208 | static int __devinit | 10208 | static int |
10209 | lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid) | 10209 | lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid) |
10210 | { | 10210 | { |
10211 | int rc; | 10211 | int rc; |
@@ -10233,7 +10233,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid) | |||
10233 | * remove routine, which will perform all the necessary cleanup for the | 10233 | * remove routine, which will perform all the necessary cleanup for the |
10234 | * device to be removed from the PCI subsystem properly. | 10234 | * device to be removed from the PCI subsystem properly. |
10235 | **/ | 10235 | **/ |
10236 | static void __devexit | 10236 | static void |
10237 | lpfc_pci_remove_one(struct pci_dev *pdev) | 10237 | lpfc_pci_remove_one(struct pci_dev *pdev) |
10238 | { | 10238 | { |
10239 | struct Scsi_Host *shost = pci_get_drvdata(pdev); | 10239 | struct Scsi_Host *shost = pci_get_drvdata(pdev); |
@@ -10575,7 +10575,7 @@ static struct pci_driver lpfc_driver = { | |||
10575 | .name = LPFC_DRIVER_NAME, | 10575 | .name = LPFC_DRIVER_NAME, |
10576 | .id_table = lpfc_id_table, | 10576 | .id_table = lpfc_id_table, |
10577 | .probe = lpfc_pci_probe_one, | 10577 | .probe = lpfc_pci_probe_one, |
10578 | .remove = __devexit_p(lpfc_pci_remove_one), | 10578 | .remove = lpfc_pci_remove_one, |
10579 | .suspend = lpfc_pci_suspend_one, | 10579 | .suspend = lpfc_pci_suspend_one, |
10580 | .resume = lpfc_pci_resume_one, | 10580 | .resume = lpfc_pci_resume_one, |
10581 | .err_handler = &lpfc_err_handler, | 10581 | .err_handler = &lpfc_err_handler, |