diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 18:14:44 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:16 -0500 |
commit | 0fe763c570ad2701c830b9e4e53c65ad89c11c32 (patch) | |
tree | 88a648c1cbcda318507d339bf93f1b24af4ff4bf /drivers/sn/ioc3.c | |
parent | 8d85fce77edfc22f1d6dbf78e3af723b4b556f3d (diff) |
Drivers: misc: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/sn/ioc3.c')
-rw-r--r-- | drivers/sn/ioc3.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c index b3b33fa26acd..fb7ea0d9a734 100644 --- a/drivers/sn/ioc3.c +++ b/drivers/sn/ioc3.c | |||
@@ -575,11 +575,10 @@ void ioc3_unregister_submodule(struct ioc3_submodule *is) | |||
575 | * Device management * | 575 | * Device management * |
576 | *********************/ | 576 | *********************/ |
577 | 577 | ||
578 | static char * __devinitdata | 578 | static char *ioc3_class_names[] = { "unknown", "IP27 BaseIO", "IP30 system", |
579 | ioc3_class_names[]={"unknown", "IP27 BaseIO", "IP30 system", "MENET 1/2/3", | 579 | "MENET 1/2/3", "MENET 4", "CADduo", "Altix Serial" }; |
580 | "MENET 4", "CADduo", "Altix Serial"}; | ||
581 | 580 | ||
582 | static int __devinit ioc3_class(struct ioc3_driver_data *idd) | 581 | static int ioc3_class(struct ioc3_driver_data *idd) |
583 | { | 582 | { |
584 | int res = IOC3_CLASS_NONE; | 583 | int res = IOC3_CLASS_NONE; |
585 | /* NIC-based logic */ | 584 | /* NIC-based logic */ |
@@ -602,8 +601,7 @@ static int __devinit ioc3_class(struct ioc3_driver_data *idd) | |||
602 | return res; | 601 | return res; |
603 | } | 602 | } |
604 | /* Adds a new instance of an IOC3 card */ | 603 | /* Adds a new instance of an IOC3 card */ |
605 | static int __devinit | 604 | static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) |
606 | ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | ||
607 | { | 605 | { |
608 | struct ioc3_driver_data *idd; | 606 | struct ioc3_driver_data *idd; |
609 | uint32_t pcmd; | 607 | uint32_t pcmd; |
@@ -755,7 +753,7 @@ out: | |||
755 | } | 753 | } |
756 | 754 | ||
757 | /* Removes a particular instance of an IOC3 card. */ | 755 | /* Removes a particular instance of an IOC3 card. */ |
758 | static void __devexit ioc3_remove(struct pci_dev *pdev) | 756 | static void ioc3_remove(struct pci_dev *pdev) |
759 | { | 757 | { |
760 | int id; | 758 | int id; |
761 | struct ioc3_driver_data *idd; | 759 | struct ioc3_driver_data *idd; |
@@ -807,7 +805,7 @@ static struct pci_driver ioc3_driver = { | |||
807 | .name = "IOC3", | 805 | .name = "IOC3", |
808 | .id_table = ioc3_id_table, | 806 | .id_table = ioc3_id_table, |
809 | .probe = ioc3_probe, | 807 | .probe = ioc3_probe, |
810 | .remove = __devexit_p(ioc3_remove), | 808 | .remove = ioc3_remove, |
811 | }; | 809 | }; |
812 | 810 | ||
813 | MODULE_DEVICE_TABLE(pci, ioc3_id_table); | 811 | MODULE_DEVICE_TABLE(pci, ioc3_id_table); |