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/mvumi.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/mvumi.c')
-rw-r--r-- | drivers/scsi/mvumi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c index c585a925b3cd..4594ccaaf49b 100644 --- a/drivers/scsi/mvumi.c +++ b/drivers/scsi/mvumi.c | |||
@@ -2506,8 +2506,7 @@ fail_add_device: | |||
2506 | * @pdev: PCI device structure | 2506 | * @pdev: PCI device structure |
2507 | * @id: PCI ids of supported hotplugged adapter | 2507 | * @id: PCI ids of supported hotplugged adapter |
2508 | */ | 2508 | */ |
2509 | static int __devinit mvumi_probe_one(struct pci_dev *pdev, | 2509 | static int mvumi_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) |
2510 | const struct pci_device_id *id) | ||
2511 | { | 2510 | { |
2512 | struct Scsi_Host *host; | 2511 | struct Scsi_Host *host; |
2513 | struct mvumi_hba *mhba; | 2512 | struct mvumi_hba *mhba; |
@@ -2728,7 +2727,7 @@ static struct pci_driver mvumi_pci_driver = { | |||
2728 | .name = MV_DRIVER_NAME, | 2727 | .name = MV_DRIVER_NAME, |
2729 | .id_table = mvumi_pci_table, | 2728 | .id_table = mvumi_pci_table, |
2730 | .probe = mvumi_probe_one, | 2729 | .probe = mvumi_probe_one, |
2731 | .remove = __devexit_p(mvumi_detach_one), | 2730 | .remove = mvumi_detach_one, |
2732 | .shutdown = mvumi_shutdown, | 2731 | .shutdown = mvumi_shutdown, |
2733 | #ifdef CONFIG_PM | 2732 | #ifdef CONFIG_PM |
2734 | .suspend = mvumi_suspend, | 2733 | .suspend = mvumi_suspend, |