diff options
author | Corey Minyard <cminyard@mvista.com> | 2010-10-27 18:34:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 21:03:13 -0400 |
commit | 60ee6d5faf5f7920ba88b82c072864596f5b88af (patch) | |
tree | d3d861b091073e863a4befcd25019f98944a3098 | |
parent | 03145beb455cf5c20a761e8451e30b8a74ba58d9 (diff) |
ipmi: fix __init and __exit attribute locations
__init and __exit belong after the return type on functions, not
before.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/char/ipmi/ipmi_devintf.c | 4 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_msghandler.c | 4 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c index 1fc8876af1f5..2aa3977aae5e 100644 --- a/drivers/char/ipmi/ipmi_devintf.c +++ b/drivers/char/ipmi/ipmi_devintf.c | |||
@@ -916,7 +916,7 @@ static struct ipmi_smi_watcher smi_watcher = | |||
916 | .smi_gone = ipmi_smi_gone, | 916 | .smi_gone = ipmi_smi_gone, |
917 | }; | 917 | }; |
918 | 918 | ||
919 | static __init int init_ipmi_devintf(void) | 919 | static int __init init_ipmi_devintf(void) |
920 | { | 920 | { |
921 | int rv; | 921 | int rv; |
922 | 922 | ||
@@ -954,7 +954,7 @@ static __init int init_ipmi_devintf(void) | |||
954 | } | 954 | } |
955 | module_init(init_ipmi_devintf); | 955 | module_init(init_ipmi_devintf); |
956 | 956 | ||
957 | static __exit void cleanup_ipmi(void) | 957 | static void __exit cleanup_ipmi(void) |
958 | { | 958 | { |
959 | struct ipmi_reg_list *entry, *entry2; | 959 | struct ipmi_reg_list *entry, *entry2; |
960 | mutex_lock(®_list_mutex); | 960 | mutex_lock(®_list_mutex); |
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 4f3f8c9ec262..2fe72f8edf44 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c | |||
@@ -4442,13 +4442,13 @@ static int ipmi_init_msghandler(void) | |||
4442 | return 0; | 4442 | return 0; |
4443 | } | 4443 | } |
4444 | 4444 | ||
4445 | static __init int ipmi_init_msghandler_mod(void) | 4445 | static int __init ipmi_init_msghandler_mod(void) |
4446 | { | 4446 | { |
4447 | ipmi_init_msghandler(); | 4447 | ipmi_init_msghandler(); |
4448 | return 0; | 4448 | return 0; |
4449 | } | 4449 | } |
4450 | 4450 | ||
4451 | static __exit void cleanup_ipmi(void) | 4451 | static void __exit cleanup_ipmi(void) |
4452 | { | 4452 | { |
4453 | int count; | 4453 | int count; |
4454 | 4454 | ||
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index b293d57d30a7..035da9e64a17 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -1846,7 +1846,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp) | |||
1846 | return rv; | 1846 | return rv; |
1847 | } | 1847 | } |
1848 | 1848 | ||
1849 | static __devinit void hardcode_find_bmc(void) | 1849 | static void __devinit hardcode_find_bmc(void) |
1850 | { | 1850 | { |
1851 | int i; | 1851 | int i; |
1852 | struct smi_info *info; | 1852 | struct smi_info *info; |
@@ -2029,7 +2029,7 @@ struct SPMITable { | |||
2029 | s8 spmi_id[1]; /* A '\0' terminated array starts here. */ | 2029 | s8 spmi_id[1]; /* A '\0' terminated array starts here. */ |
2030 | }; | 2030 | }; |
2031 | 2031 | ||
2032 | static __devinit int try_init_spmi(struct SPMITable *spmi) | 2032 | static int __devinit try_init_spmi(struct SPMITable *spmi) |
2033 | { | 2033 | { |
2034 | struct smi_info *info; | 2034 | struct smi_info *info; |
2035 | 2035 | ||
@@ -2112,7 +2112,7 @@ static __devinit int try_init_spmi(struct SPMITable *spmi) | |||
2112 | return 0; | 2112 | return 0; |
2113 | } | 2113 | } |
2114 | 2114 | ||
2115 | static __devinit void spmi_find_bmc(void) | 2115 | static void __devinit spmi_find_bmc(void) |
2116 | { | 2116 | { |
2117 | acpi_status status; | 2117 | acpi_status status; |
2118 | struct SPMITable *spmi; | 2118 | struct SPMITable *spmi; |
@@ -2325,7 +2325,7 @@ static int __devinit decode_dmi(const struct dmi_header *dm, | |||
2325 | return 0; | 2325 | return 0; |
2326 | } | 2326 | } |
2327 | 2327 | ||
2328 | static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data) | 2328 | static void __devinit try_init_dmi(struct dmi_ipmi_data *ipmi_data) |
2329 | { | 2329 | { |
2330 | struct smi_info *info; | 2330 | struct smi_info *info; |
2331 | 2331 | ||
@@ -3012,7 +3012,7 @@ static __devinitdata struct ipmi_default_vals | |||
3012 | { .port = 0 } | 3012 | { .port = 0 } |
3013 | }; | 3013 | }; |
3014 | 3014 | ||
3015 | static __devinit void default_find_bmc(void) | 3015 | static void __devinit default_find_bmc(void) |
3016 | { | 3016 | { |
3017 | struct smi_info *info; | 3017 | struct smi_info *info; |
3018 | int i; | 3018 | int i; |
@@ -3312,7 +3312,7 @@ static int try_smi_init(struct smi_info *new_smi) | |||
3312 | return rv; | 3312 | return rv; |
3313 | } | 3313 | } |
3314 | 3314 | ||
3315 | static __devinit int init_ipmi_si(void) | 3315 | static int __devinit init_ipmi_si(void) |
3316 | { | 3316 | { |
3317 | int i; | 3317 | int i; |
3318 | char *str; | 3318 | char *str; |
@@ -3525,7 +3525,7 @@ static void cleanup_one_si(struct smi_info *to_clean) | |||
3525 | kfree(to_clean); | 3525 | kfree(to_clean); |
3526 | } | 3526 | } |
3527 | 3527 | ||
3528 | static __exit void cleanup_ipmi_si(void) | 3528 | static void __exit cleanup_ipmi_si(void) |
3529 | { | 3529 | { |
3530 | struct smi_info *e, *tmp_e; | 3530 | struct smi_info *e, *tmp_e; |
3531 | 3531 | ||