aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/meye.c2
-rw-r--r--drivers/media/video/msp3400.c4
-rw-r--r--drivers/media/video/tda9887.c2
-rw-r--r--drivers/media/video/tuner-core.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index be72c2ce242e..fe194012bccf 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1768,7 +1768,7 @@ static struct video_device meye_template = {
1768}; 1768};
1769 1769
1770#ifdef CONFIG_PM 1770#ifdef CONFIG_PM
1771static int meye_suspend(struct pci_dev *pdev, u32 state) 1771static int meye_suspend(struct pci_dev *pdev, pm_message_t state)
1772{ 1772{
1773 pci_save_state(pdev); 1773 pci_save_state(pdev);
1774 meye.pm_mchip_mode = meye.mchip_mode; 1774 meye.pm_mchip_mode = meye.mchip_mode;
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index d996ec99caff..c97df705df5e 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1426,7 +1426,7 @@ static int msp_detach(struct i2c_client *client);
1426static int msp_probe(struct i2c_adapter *adap); 1426static int msp_probe(struct i2c_adapter *adap);
1427static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg); 1427static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
1428 1428
1429static int msp_suspend(struct device * dev, u32 state, u32 level); 1429static int msp_suspend(struct device * dev, pm_message_t state, u32 level);
1430static int msp_resume(struct device * dev, u32 level); 1430static int msp_resume(struct device * dev, u32 level);
1431 1431
1432static void msp_wake_thread(struct i2c_client *client); 1432static void msp_wake_thread(struct i2c_client *client);
@@ -1834,7 +1834,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
1834 return 0; 1834 return 0;
1835} 1835}
1836 1836
1837static int msp_suspend(struct device * dev, u32 state, u32 level) 1837static int msp_suspend(struct device * dev, pm_message_t state, u32 level)
1838{ 1838{
1839 struct i2c_client *c = container_of(dev, struct i2c_client, dev); 1839 struct i2c_client *c = container_of(dev, struct i2c_client, dev);
1840 1840
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 7fb063a27961..d9c3169f9a04 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -741,7 +741,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
741 return 0; 741 return 0;
742} 742}
743 743
744static int tda9887_suspend(struct device * dev, u32 state, u32 level) 744static int tda9887_suspend(struct device * dev, pm_message_t state, u32 level)
745{ 745{
746 dprintk("tda9887: suspend\n"); 746 dprintk("tda9887: suspend\n");
747 return 0; 747 return 0;
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 2f4e18d20b7a..eded776a2312 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -378,7 +378,7 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
378 return 0; 378 return 0;
379} 379}
380 380
381static int tuner_suspend(struct device * dev, u32 state, u32 level) 381static int tuner_suspend(struct device * dev, pm_message_t state, u32 level)
382{ 382{
383 struct i2c_client *c = container_of(dev, struct i2c_client, dev); 383 struct i2c_client *c = container_of(dev, struct i2c_client, dev);
384 struct tuner *t = i2c_get_clientdata(c); 384 struct tuner *t = i2c_get_clientdata(c);