diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:27 -0700 |
| commit | a291068991c4d0cc4c2bd533094422bf417c86dd (patch) | |
| tree | df3494c807602bdaa5e83cd04bf61c24bcfa516d | |
| parent | 8bf28030f3683f69669d08cb5b32bc46db3d22ae (diff) | |
| download | linux-3.10-a291068991c4d0cc4c2bd533094422bf417c86dd.tar.gz linux-3.10-a291068991c4d0cc4c2bd533094422bf417c86dd.tar.bz2 linux-3.10-a291068991c4d0cc4c2bd533094422bf417c86dd.zip | |
[PATCH] fix u32 vs. pm_message_t in drivers/media
Here are fixes for drivers/media.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/media/dvb/cinergyT2/cinergyT2.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/meye.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/msp3400.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/tda9887.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/tuner-core.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c index f1f53976137..28d4d926de3 100644 --- a/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -879,7 +879,7 @@ static void cinergyt2_disconnect (struct usb_interface *intf) kfree(cinergyt2); } -static int cinergyt2_suspend (struct usb_interface *intf, u32 state) +static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state) { struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf); diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index be72c2ce242..fe194012bcc 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c @@ -1768,7 +1768,7 @@ static struct video_device meye_template = { }; #ifdef CONFIG_PM -static int meye_suspend(struct pci_dev *pdev, u32 state) +static int meye_suspend(struct pci_dev *pdev, pm_message_t state) { pci_save_state(pdev); meye.pm_mchip_mode = meye.mchip_mode; diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c index d996ec99caf..c97df705df5 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); static int msp_probe(struct i2c_adapter *adap); static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg); -static int msp_suspend(struct device * dev, u32 state, u32 level); +static int msp_suspend(struct device * dev, pm_message_t state, u32 level); static int msp_resume(struct device * dev, u32 level); static 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) return 0; } -static int msp_suspend(struct device * dev, u32 state, u32 level) +static int msp_suspend(struct device * dev, pm_message_t state, u32 level) { struct i2c_client *c = container_of(dev, struct i2c_client, dev); diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c index 7fb063a2796..d9c3169f9a0 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) return 0; } -static int tda9887_suspend(struct device * dev, u32 state, u32 level) +static int tda9887_suspend(struct device * dev, pm_message_t state, u32 level) { dprintk("tda9887: suspend\n"); return 0; diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index 2f4e18d20b7..eded776a231 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) return 0; } -static int tuner_suspend(struct device * dev, u32 state, u32 level) +static int tuner_suspend(struct device * dev, pm_message_t state, u32 level) { struct i2c_client *c = container_of(dev, struct i2c_client, dev); struct tuner *t = i2c_get_clientdata(c); |