Skip to content

Commit

Permalink
ipmi: fix __init and __exit attribute locations
Browse files Browse the repository at this point in the history
__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>
  • Loading branch information
Corey Minyard authored and Linus Torvalds committed Oct 28, 2010
1 parent 03145be commit 60ee6d5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions drivers/char/ipmi/ipmi_devintf.c
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@ static struct ipmi_smi_watcher smi_watcher =
.smi_gone = ipmi_smi_gone,
};

static __init int init_ipmi_devintf(void)
static int __init init_ipmi_devintf(void)
{
int rv;

Expand Down Expand Up @@ -954,7 +954,7 @@ static __init int init_ipmi_devintf(void)
}
module_init(init_ipmi_devintf);

static __exit void cleanup_ipmi(void)
static void __exit cleanup_ipmi(void)
{
struct ipmi_reg_list *entry, *entry2;
mutex_lock(&reg_list_mutex);
Expand Down
4 changes: 2 additions & 2 deletions drivers/char/ipmi/ipmi_msghandler.c
Original file line number Diff line number Diff line change
Expand Up @@ -4442,13 +4442,13 @@ static int ipmi_init_msghandler(void)
return 0;
}

static __init int ipmi_init_msghandler_mod(void)
static int __init ipmi_init_msghandler_mod(void)
{
ipmi_init_msghandler();
return 0;
}

static __exit void cleanup_ipmi(void)
static void __exit cleanup_ipmi(void)
{
int count;

Expand Down
14 changes: 7 additions & 7 deletions drivers/char/ipmi/ipmi_si_intf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1846,7 +1846,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
return rv;
}

static __devinit void hardcode_find_bmc(void)
static void __devinit hardcode_find_bmc(void)
{
int i;
struct smi_info *info;
Expand Down Expand Up @@ -2029,7 +2029,7 @@ struct SPMITable {
s8 spmi_id[1]; /* A '\0' terminated array starts here. */
};

static __devinit int try_init_spmi(struct SPMITable *spmi)
static int __devinit try_init_spmi(struct SPMITable *spmi)
{
struct smi_info *info;

Expand Down Expand Up @@ -2112,7 +2112,7 @@ static __devinit int try_init_spmi(struct SPMITable *spmi)
return 0;
}

static __devinit void spmi_find_bmc(void)
static void __devinit spmi_find_bmc(void)
{
acpi_status status;
struct SPMITable *spmi;
Expand Down Expand Up @@ -2325,7 +2325,7 @@ static int __devinit decode_dmi(const struct dmi_header *dm,
return 0;
}

static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
static void __devinit try_init_dmi(struct dmi_ipmi_data *ipmi_data)
{
struct smi_info *info;

Expand Down Expand Up @@ -3012,7 +3012,7 @@ static __devinitdata struct ipmi_default_vals
{ .port = 0 }
};

static __devinit void default_find_bmc(void)
static void __devinit default_find_bmc(void)
{
struct smi_info *info;
int i;
Expand Down Expand Up @@ -3312,7 +3312,7 @@ static int try_smi_init(struct smi_info *new_smi)
return rv;
}

static __devinit int init_ipmi_si(void)
static int __devinit init_ipmi_si(void)
{
int i;
char *str;
Expand Down Expand Up @@ -3525,7 +3525,7 @@ static void cleanup_one_si(struct smi_info *to_clean)
kfree(to_clean);
}

static __exit void cleanup_ipmi_si(void)
static void __exit cleanup_ipmi_si(void)
{
struct smi_info *e, *tmp_e;

Expand Down

0 comments on commit 60ee6d5

Please sign in to comment.