lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfd: Move AB3100 to __devinit

Browse Source 
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>
This commit is contained in:
Linus Walleij
2010-08-20 10:26:56 +02:00
committed by Samuel Ortiz
parent deb26e92f9
commit 2524468ee5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mfd/ab3100-core.c
View File

@@ -666,7 +666,7 @@ struct ab3100_init_setting {
u8 setting; u8 setting;
}; };
static const struct ab3100_init_setting __initconst static const struct ab3100_init_setting __devinitconst
ab3100_init_settings[] = { ab3100_init_settings[] = {
{ {
.abreg = AB3100_MCA, .abreg = AB3100_MCA,
@@ -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 err = 0;
int i; int i;
@@ -796,7 +796,7 @@ struct ab_family_id {
char *name; char *name;
}; };
static const struct ab_family_id ids[] __initdata = { static const struct ab_family_id ids[] __devinitdata = {
/* AB3100 */ /* AB3100 */
{ {
.id = 0xc0, .id = 0xc0,
@@ -850,7 +850,7 @@ static const struct ab_family_id ids[] __initdata = {
}, },
}; };
static int __init ab3100_probe(struct i2c_client *client, static int __devinit ab3100_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct ab3100 *ab3100; struct ab3100 *ab3100;
@@ -962,7 +962,7 @@ static int __init ab3100_probe(struct i2c_client *client,
return err; 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); struct ab3100 *ab3100 = i2c_get_clientdata(client);
int i; int i;
@@ -996,7 +996,7 @@ static struct i2c_driver ab3100_driver = {
}, },
.id_table = ab3100_id, .id_table = ab3100_id,
.probe = ab3100_probe, .probe = ab3100_probe,
.remove = __exit_p(ab3100_remove), .remove = __devexit_p(ab3100_remove),
}; };
static int __init ab3100_i2c_init(void) static int __init ab3100_i2c_init(void)