diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 16:17:53 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:02 -0500 |
commit | 4c62e9764ab403d42f9b8871b1241fe7812f19d4 (patch) | |
tree | b4ae1ce3993ebf1d64660ba16362f9ef3de73074 /drivers/media/i2c/as3645a.c | |
parent | c571b211a70bcb04249be5cb7338f95d2ec8100f (diff) |
Drivers: media: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.
This change removes the use of __devinit, __devexit_p, __devinitdata,
__devinitconst, and __devexit from these drivers.
Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/i2c/as3645a.c')
-rw-r--r-- | drivers/media/i2c/as3645a.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/i2c/as3645a.c b/drivers/media/i2c/as3645a.c index 3bfdbf9d9bf1..58d523f2648f 100644 --- a/drivers/media/i2c/as3645a.c +++ b/drivers/media/i2c/as3645a.c | |||
@@ -713,7 +713,7 @@ static int as3645a_resume(struct device *dev) | |||
713 | * The number of LEDs reported in platform data is used to compute default | 713 | * The number of LEDs reported in platform data is used to compute default |
714 | * limits. Parameters passed through platform data can override those limits. | 714 | * limits. Parameters passed through platform data can override those limits. |
715 | */ | 715 | */ |
716 | static int __devinit as3645a_init_controls(struct as3645a *flash) | 716 | static int as3645a_init_controls(struct as3645a *flash) |
717 | { | 717 | { |
718 | const struct as3645a_platform_data *pdata = flash->pdata; | 718 | const struct as3645a_platform_data *pdata = flash->pdata; |
719 | struct v4l2_ctrl *ctrl; | 719 | struct v4l2_ctrl *ctrl; |
@@ -804,8 +804,8 @@ static int __devinit as3645a_init_controls(struct as3645a *flash) | |||
804 | return flash->ctrls.error; | 804 | return flash->ctrls.error; |
805 | } | 805 | } |
806 | 806 | ||
807 | static int __devinit as3645a_probe(struct i2c_client *client, | 807 | static int as3645a_probe(struct i2c_client *client, |
808 | const struct i2c_device_id *devid) | 808 | const struct i2c_device_id *devid) |
809 | { | 809 | { |
810 | struct as3645a *flash; | 810 | struct as3645a *flash; |
811 | int ret; | 811 | int ret; |
@@ -846,7 +846,7 @@ done: | |||
846 | return ret; | 846 | return ret; |
847 | } | 847 | } |
848 | 848 | ||
849 | static int __devexit as3645a_remove(struct i2c_client *client) | 849 | static int as3645a_remove(struct i2c_client *client) |
850 | { | 850 | { |
851 | struct v4l2_subdev *subdev = i2c_get_clientdata(client); | 851 | struct v4l2_subdev *subdev = i2c_get_clientdata(client); |
852 | struct as3645a *flash = to_as3645a(subdev); | 852 | struct as3645a *flash = to_as3645a(subdev); |
@@ -877,7 +877,7 @@ static struct i2c_driver as3645a_i2c_driver = { | |||
877 | .pm = &as3645a_pm_ops, | 877 | .pm = &as3645a_pm_ops, |
878 | }, | 878 | }, |
879 | .probe = as3645a_probe, | 879 | .probe = as3645a_probe, |
880 | .remove = __devexit_p(as3645a_remove), | 880 | .remove = as3645a_remove, |
881 | .id_table = as3645a_id_table, | 881 | .id_table = as3645a_id_table, |
882 | }; | 882 | }; |
883 | 883 | ||