diff options
Diffstat (limited to 'drivers/media/i2c/adv7180.c')
-rw-r--r-- | drivers/media/i2c/adv7180.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c index 45ecf8db1eae..64d71fb87a96 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c | |||
@@ -540,8 +540,8 @@ static int init_device(struct i2c_client *client, struct adv7180_state *state) | |||
540 | return 0; | 540 | return 0; |
541 | } | 541 | } |
542 | 542 | ||
543 | static __devinit int adv7180_probe(struct i2c_client *client, | 543 | static int adv7180_probe(struct i2c_client *client, |
544 | const struct i2c_device_id *id) | 544 | const struct i2c_device_id *id) |
545 | { | 545 | { |
546 | struct adv7180_state *state; | 546 | struct adv7180_state *state; |
547 | struct v4l2_subdev *sd; | 547 | struct v4l2_subdev *sd; |
@@ -587,7 +587,7 @@ err: | |||
587 | return ret; | 587 | return ret; |
588 | } | 588 | } |
589 | 589 | ||
590 | static __devexit int adv7180_remove(struct i2c_client *client) | 590 | static int adv7180_remove(struct i2c_client *client) |
591 | { | 591 | { |
592 | struct v4l2_subdev *sd = i2c_get_clientdata(client); | 592 | struct v4l2_subdev *sd = i2c_get_clientdata(client); |
593 | struct adv7180_state *state = to_state(sd); | 593 | struct adv7180_state *state = to_state(sd); |
@@ -652,7 +652,7 @@ static struct i2c_driver adv7180_driver = { | |||
652 | .name = KBUILD_MODNAME, | 652 | .name = KBUILD_MODNAME, |
653 | }, | 653 | }, |
654 | .probe = adv7180_probe, | 654 | .probe = adv7180_probe, |
655 | .remove = __devexit_p(adv7180_remove), | 655 | .remove = adv7180_remove, |
656 | #ifdef CONFIG_PM | 656 | #ifdef CONFIG_PM |
657 | .suspend = adv7180_suspend, | 657 | .suspend = adv7180_suspend, |
658 | .resume = adv7180_resume, | 658 | .resume = adv7180_resume, |