Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] fix u32 vs. pm_message_t in drivers/media

Browse Source 
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>
This commit is contained in:
Pavel Machek 2005-04-16 15:25:27 -07:00 committed by Linus Torvalds
parent 8bf28030f3
commit a291068991
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/dvb/cinergyT2/cinergyT2.c
View File

@ -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);

2
drivers/media/video/meye.c
View File

@ -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;

4
drivers/media/video/msp3400.c
View File

@ -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);

2
drivers/media/video/tda9887.c
View File

@ -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;

2
drivers/media/video/tuner-core.c
View File

@ -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);