diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2010-08-20 04:26:56 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-10-28 18:28:40 -0400 |
commit | 2524468ee586e7ba25bd5a0551acf1fea7e9a0b3 (patch) | |
tree | ddc073f9bce2122ba5a6446daf8f19c260332643 /drivers/mfd | |
parent | deb26e92f9494c4da2f3c66a93f3744da96a9cee (diff) |
mfd: Move AB3100 to __devinit
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>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/ab3100-core.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c index b048ecc56db9..6733d56cbb52 100644 --- a/drivers/mfd/ab3100-core.c +++ b/drivers/mfd/ab3100-core.c | |||
@@ -666,7 +666,7 @@ struct ab3100_init_setting { | |||
666 | u8 setting; | 666 | u8 setting; |
667 | }; | 667 | }; |
668 | 668 | ||
669 | static const struct ab3100_init_setting __initconst | 669 | static const struct ab3100_init_setting __devinitconst |
670 | ab3100_init_settings[] = { | 670 | ab3100_init_settings[] = { |
671 | { | 671 | { |
672 | .abreg = AB3100_MCA, | 672 | .abreg = AB3100_MCA, |
@@ -713,7 +713,7 @@ ab3100_init_settings[] = { | |||
713 | }, | 713 | }, |
714 | }; | 714 | }; |
715 | 715 | ||
716 | static int __init ab3100_setup(struct ab3100 *ab3100) | 716 | static int __devinit ab3100_setup(struct ab3100 *ab3100) |
717 | { | 717 | { |
718 | int err = 0; | 718 | int err = 0; |
719 | int i; | 719 | int i; |
@@ -796,7 +796,7 @@ struct ab_family_id { | |||
796 | char *name; | 796 | char *name; |
797 | }; | 797 | }; |
798 | 798 | ||
799 | static const struct ab_family_id ids[] __initdata = { | 799 | static const struct ab_family_id ids[] __devinitdata = { |
800 | /* AB3100 */ | 800 | /* AB3100 */ |
801 | { | 801 | { |
802 | .id = 0xc0, | 802 | .id = 0xc0, |
@@ -850,8 +850,8 @@ static const struct ab_family_id ids[] __initdata = { | |||
850 | }, | 850 | }, |
851 | }; | 851 | }; |
852 | 852 | ||
853 | static int __init ab3100_probe(struct i2c_client *client, | 853 | static int __devinit ab3100_probe(struct i2c_client *client, |
854 | const struct i2c_device_id *id) | 854 | const struct i2c_device_id *id) |
855 | { | 855 | { |
856 | struct ab3100 *ab3100; | 856 | struct ab3100 *ab3100; |
857 | struct ab3100_platform_data *ab3100_plf_data = | 857 | struct ab3100_platform_data *ab3100_plf_data = |
@@ -962,7 +962,7 @@ static int __init ab3100_probe(struct i2c_client *client, | |||
962 | return err; | 962 | return err; |
963 | } | 963 | } |
964 | 964 | ||
965 | static int __exit ab3100_remove(struct i2c_client *client) | 965 | static int __devexit ab3100_remove(struct i2c_client *client) |
966 | { | 966 | { |
967 | struct ab3100 *ab3100 = i2c_get_clientdata(client); | 967 | struct ab3100 *ab3100 = i2c_get_clientdata(client); |
968 | int i; | 968 | int i; |
@@ -996,7 +996,7 @@ static struct i2c_driver ab3100_driver = { | |||
996 | }, | 996 | }, |
997 | .id_table = ab3100_id, | 997 | .id_table = ab3100_id, |
998 | .probe = ab3100_probe, | 998 | .probe = ab3100_probe, |
999 | .remove = __exit_p(ab3100_remove), | 999 | .remove = __devexit_p(ab3100_remove), |
1000 | }; | 1000 | }; |
1001 | 1001 | ||
1002 | static int __init ab3100_i2c_init(void) | 1002 | static int __init ab3100_i2c_init(void) |