tree df3494c807602bdaa5e83cd04bf61c24bcfa516d
parent 8bf28030f3683f69669d08cb5b32bc46db3d22ae
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:27 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:27 -0700
[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]>
media/dvb/cinergyT2/cinergyT2.c | 2 +-
media/video/meye.c | 2 +-
media/video/msp3400.c | 4 ++--
media/video/tda9887.c | 2 +-
media/video/tuner-core.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
Index: drivers/media/dvb/cinergyT2/cinergyT2.c
===================================================================
---
a42dc815087588ab706d421eb9229637de704df4/drivers/media/dvb/cinergyT2/cinergyT2.c
(mode:100644 sha1:f1f539761371fc03f39de8c5276a6527a4f62a1a)
+++
df3494c807602bdaa5e83cd04bf61c24bcfa516d/drivers/media/dvb/cinergyT2/cinergyT2.c
(mode:100644 sha1:28d4d926de3e1540ca448eb0b5532ca0838d4ee3)
@@ -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
===================================================================
--- a42dc815087588ab706d421eb9229637de704df4/drivers/media/video/meye.c
(mode:100644 sha1:be72c2ce242ef4c41517d28efe1ed868221e7197)
+++ df3494c807602bdaa5e83cd04bf61c24bcfa516d/drivers/media/video/meye.c
(mode:100644 sha1:fe194012bccf65aac168a7bfc61b48fa621767c8)
@@ -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
===================================================================
--- a42dc815087588ab706d421eb9229637de704df4/drivers/media/video/msp3400.c
(mode:100644 sha1:d996ec99caff9e57aae945af220d222a3d5f1cac)
+++ df3494c807602bdaa5e83cd04bf61c24bcfa516d/drivers/media/video/msp3400.c
(mode:100644 sha1:c97df705df5eae1c5af45e4e7aac86f4a9224e70)
@@ -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
===================================================================
--- a42dc815087588ab706d421eb9229637de704df4/drivers/media/video/tda9887.c
(mode:100644 sha1:7fb063a279610068928abd2298cf9af640bab5df)
+++ df3494c807602bdaa5e83cd04bf61c24bcfa516d/drivers/media/video/tda9887.c
(mode:100644 sha1:d9c3169f9a048e205c9200d07e55b0c7f40e4a1f)
@@ -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
===================================================================
--- a42dc815087588ab706d421eb9229637de704df4/drivers/media/video/tuner-core.c
(mode:100644 sha1:2f4e18d20b7aa67d0445a95a3e1db41a0271fbb9)
+++ df3494c807602bdaa5e83cd04bf61c24bcfa516d/drivers/media/video/tuner-core.c
(mode:100644 sha1:eded776a23129421860bb8b61c7ca1f836d5f017)
@@ -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
