tree b533102f6d48fcc18e29df89cb0cb514992c541c
parent 41c673f7f7f2e3bfc85f1ac1df4379b60b6c398e
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:25:56 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:56 2005
[PATCH] fix u32 vs. pm_message_t in drivers/media
Here are fixes for drivers/media.
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
dvb/cinergyT2/cinergyT2.c | 2 +-
video/meye.c | 2 +-
video/msp3400.c | 4 ++--
video/tda9887.c | 2 +-
video/tuner-core.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
Index: drivers/media/dvb/cinergyT2/cinergyT2.c
===================================================================
---
9d3dfb0e267a7db0b8177698c99a1fed01d4b48b/drivers/media/dvb/cinergyT2/cinergyT2.c
(mode:100644 sha1:118d429c8d587d701408d32b39d5d6af2d1ac855)
+++
b533102f6d48fcc18e29df89cb0cb514992c541c/drivers/media/dvb/cinergyT2/cinergyT2.c
(mode:100644 sha1:1389b1e078fe1eaebadc47d8c320850c80378457)
@@ -879,7 +879,7 @@
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: drivers/media/video/meye.c
===================================================================
--- 9d3dfb0e267a7db0b8177698c99a1fed01d4b48b/drivers/media/video/meye.c
(mode:100644 sha1:946df6d8371ebce642589f109e127be9f0d1374e)
+++ b533102f6d48fcc18e29df89cb0cb514992c541c/drivers/media/video/meye.c
(mode:100644 sha1:b3a228f54cf5a2647447aa61cb3ceb91f9055acc)
@@ -1768,7 +1768,7 @@
};
#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: drivers/media/video/msp3400.c
===================================================================
--- 9d3dfb0e267a7db0b8177698c99a1fed01d4b48b/drivers/media/video/msp3400.c
(mode:100644 sha1:5b71ae572f33d80e9403ad4e1265a09faf5acf7c)
+++ b533102f6d48fcc18e29df89cb0cb514992c541c/drivers/media/video/msp3400.c
(mode:100644 sha1:a337a5f2595f81b5ab8011d0114f789529bd091c)
@@ -1426,7 +1426,7 @@
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 @@
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: drivers/media/video/tda9887.c
===================================================================
--- 9d3dfb0e267a7db0b8177698c99a1fed01d4b48b/drivers/media/video/tda9887.c
(mode:100644 sha1:b15504b6f1cad915e61b9aa519b93db4c72d48bb)
+++ b533102f6d48fcc18e29df89cb0cb514992c541c/drivers/media/video/tda9887.c
(mode:100644 sha1:fef3fbeb8a5634c99b4bc32114e0b4f1815d38ae)
@@ -741,7 +741,7 @@
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: drivers/media/video/tuner-core.c
===================================================================
--- 9d3dfb0e267a7db0b8177698c99a1fed01d4b48b/drivers/media/video/tuner-core.c
(mode:100644 sha1:9792bbfca190a99558b045ee37a8baf7e9e2cd1a)
+++ b533102f6d48fcc18e29df89cb0cb514992c541c/drivers/media/video/tuner-core.c
(mode:100644 sha1:9dc410daa96fc20724b6521e4139d87083996cfa)
@@ -378,7 +378,7 @@
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);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
