]> err.no Git - linux-2.6/commitdiff
[PATCH] fix u32 vs. pm_message_t in drivers/media
authorPavel Machek <pavel@ucw.cz>
Sat, 16 Apr 2005 22:25:27 +0000 (15:25 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 22:25:27 +0000 (15:25 -0700)
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>
drivers/media/dvb/cinergyT2/cinergyT2.c
drivers/media/video/meye.c
drivers/media/video/msp3400.c
drivers/media/video/tda9887.c
drivers/media/video/tuner-core.c

index f1f539761371fc03f39de8c5276a6527a4f62a1a..28d4d926de3e1540ca448eb0b5532ca0838d4ee3 100644 (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);
 
index be72c2ce242ef4c41517d28efe1ed868221e7197..fe194012bccf65aac168a7bfc61b48fa621767c8 100644 (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;
index d996ec99caff9e57aae945af220d222a3d5f1cac..c97df705df5eae1c5af45e4e7aac86f4a9224e70 100644 (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);
 
index 7fb063a279610068928abd2298cf9af640bab5df..d9c3169f9a048e205c9200d07e55b0c7f40e4a1f 100644 (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;
index 2f4e18d20b7aa67d0445a95a3e1db41a0271fbb9..eded776a23129421860bb8b61c7ca1f836d5f017 100644 (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);