diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/msp3400.c | 8 | ||||
-rw-r--r-- | drivers/media/video/tda9887.c | 4 | ||||
-rw-r--r-- | drivers/media/video/tuner-core.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c index f0d43fc2632f..262890cb20a7 100644 --- a/drivers/media/video/msp3400.c +++ b/drivers/media/video/msp3400.c | |||
@@ -1420,8 +1420,8 @@ static int msp_detach(struct i2c_client *client); | |||
1420 | static int msp_probe(struct i2c_adapter *adap); | 1420 | static int msp_probe(struct i2c_adapter *adap); |
1421 | static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg); | 1421 | static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg); |
1422 | 1422 | ||
1423 | static int msp_suspend(struct device * dev, pm_message_t state, u32 level); | 1423 | static int msp_suspend(struct device * dev, pm_message_t state); |
1424 | static int msp_resume(struct device * dev, u32 level); | 1424 | static int msp_resume(struct device * dev); |
1425 | 1425 | ||
1426 | static void msp_wake_thread(struct i2c_client *client); | 1426 | static void msp_wake_thread(struct i2c_client *client); |
1427 | 1427 | ||
@@ -1821,7 +1821,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
1821 | return 0; | 1821 | return 0; |
1822 | } | 1822 | } |
1823 | 1823 | ||
1824 | static int msp_suspend(struct device * dev, pm_message_t state, u32 level) | 1824 | static int msp_suspend(struct device * dev, pm_message_t state) |
1825 | { | 1825 | { |
1826 | struct i2c_client *c = container_of(dev, struct i2c_client, dev); | 1826 | struct i2c_client *c = container_of(dev, struct i2c_client, dev); |
1827 | 1827 | ||
@@ -1830,7 +1830,7 @@ static int msp_suspend(struct device * dev, pm_message_t state, u32 level) | |||
1830 | return 0; | 1830 | return 0; |
1831 | } | 1831 | } |
1832 | 1832 | ||
1833 | static int msp_resume(struct device * dev, u32 level) | 1833 | static int msp_resume(struct device * dev) |
1834 | { | 1834 | { |
1835 | struct i2c_client *c = container_of(dev, struct i2c_client, dev); | 1835 | struct i2c_client *c = container_of(dev, struct i2c_client, dev); |
1836 | 1836 | ||
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c index 0456dda2624d..94053f149ddf 100644 --- a/drivers/media/video/tda9887.c +++ b/drivers/media/video/tda9887.c | |||
@@ -784,13 +784,13 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
784 | return 0; | 784 | return 0; |
785 | } | 785 | } |
786 | 786 | ||
787 | static int tda9887_suspend(struct device * dev, pm_message_t state, u32 level) | 787 | static int tda9887_suspend(struct device * dev, pm_message_t state) |
788 | { | 788 | { |
789 | dprintk("tda9887: suspend\n"); | 789 | dprintk("tda9887: suspend\n"); |
790 | return 0; | 790 | return 0; |
791 | } | 791 | } |
792 | 792 | ||
793 | static int tda9887_resume(struct device * dev, u32 level) | 793 | static int tda9887_resume(struct device * dev) |
794 | { | 794 | { |
795 | struct i2c_client *c = container_of(dev, struct i2c_client, dev); | 795 | struct i2c_client *c = container_of(dev, struct i2c_client, dev); |
796 | struct tda9887 *t = i2c_get_clientdata(c); | 796 | struct tda9887 *t = i2c_get_clientdata(c); |
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index 05572020af4d..ad85bef1c3d5 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
@@ -697,7 +697,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
697 | return 0; | 697 | return 0; |
698 | } | 698 | } |
699 | 699 | ||
700 | static int tuner_suspend(struct device *dev, pm_message_t state, u32 level) | 700 | static int tuner_suspend(struct device *dev, pm_message_t state) |
701 | { | 701 | { |
702 | struct i2c_client *c = container_of (dev, struct i2c_client, dev); | 702 | struct i2c_client *c = container_of (dev, struct i2c_client, dev); |
703 | struct tuner *t = i2c_get_clientdata (c); | 703 | struct tuner *t = i2c_get_clientdata (c); |
@@ -707,7 +707,7 @@ static int tuner_suspend(struct device *dev, pm_message_t state, u32 level) | |||
707 | return 0; | 707 | return 0; |
708 | } | 708 | } |
709 | 709 | ||
710 | static int tuner_resume(struct device *dev, u32 level) | 710 | static int tuner_resume(struct device *dev) |
711 | { | 711 | { |
712 | struct i2c_client *c = container_of (dev, struct i2c_client, dev); | 712 | struct i2c_client *c = container_of (dev, struct i2c_client, dev); |
713 | struct tuner *t = i2c_get_clientdata (c); | 713 | struct tuner *t = i2c_get_clientdata (c); |