Skip to content

Commit

Permalink
mfd: Move AB3100 to __devinit
Browse files Browse the repository at this point in the history
Since there is no discardable probe() function in the I2C device
framework, let's just tag it __devinit and take the footprint hit
rather than seeing the compilation warnings every day.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Linus Walleij authored and Samuel Ortiz committed Oct 28, 2010
1 parent deb26e9 commit 2524468
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/mfd/ab3100-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ struct ab3100_init_setting {
u8 setting;
};

static const struct ab3100_init_setting __initconst
static const struct ab3100_init_setting __devinitconst
ab3100_init_settings[] = {
{
.abreg = AB3100_MCA,
Expand Down Expand Up @@ -713,7 +713,7 @@ ab3100_init_settings[] = {
},
};

static int __init ab3100_setup(struct ab3100 *ab3100)
static int __devinit ab3100_setup(struct ab3100 *ab3100)
{
int err = 0;
int i;
Expand Down Expand Up @@ -796,7 +796,7 @@ struct ab_family_id {
char *name;
};

static const struct ab_family_id ids[] __initdata = {
static const struct ab_family_id ids[] __devinitdata = {
/* AB3100 */
{
.id = 0xc0,
Expand Down Expand Up @@ -850,8 +850,8 @@ static const struct ab_family_id ids[] __initdata = {
},
};

static int __init ab3100_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int __devinit ab3100_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct ab3100 *ab3100;
struct ab3100_platform_data *ab3100_plf_data =
Expand Down Expand Up @@ -962,7 +962,7 @@ static int __init ab3100_probe(struct i2c_client *client,
return err;
}

static int __exit ab3100_remove(struct i2c_client *client)
static int __devexit ab3100_remove(struct i2c_client *client)
{
struct ab3100 *ab3100 = i2c_get_clientdata(client);
int i;
Expand Down Expand Up @@ -996,7 +996,7 @@ static struct i2c_driver ab3100_driver = {
},
.id_table = ab3100_id,
.probe = ab3100_probe,
.remove = __exit_p(ab3100_remove),
.remove = __devexit_p(ab3100_remove),
};

static int __init ab3100_i2c_init(void)
Expand Down

0 comments on commit 2524468

Please sign in to comment.