* bttv-driver.c, msp3400.c, tda9887.c, tuner-core.c:

        - driver.suspend API modified at 2.6.13-rc3-mm1.
        - Warnings removed when compiling against 2.6.13-rc3-mm1.

        Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

5 files changed, 32 insertions, 3 deletions

diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index 7897769e8..2344e1cbd 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-driver.c,v 1.42 2005/07/05 17:37:35 nsh Exp $
+    $Id: bttv-driver.c,v 1.43 2005/07/15 20:09:38 mchehab Exp $
 
     bttv - Bt848 frame grabber driver
 
@@ -35,6 +35,7 @@
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/kdev_t.h>
+#include <linux/pci.h>
 #include <linux/dma-mapping.h>
 
 #include <asm/io.h>
@@ -4065,7 +4066,11 @@ static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state)
 	struct bttv_buffer_set idle;
 	unsigned long flags;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 	dprintk("bttv%d: suspend %d\n", btv->c.nr, state);
+#else
+	dprintk("bttv%d: suspend %d\n", btv->c.nr, state.event);
+#endif
 
 	/* stop dma + irqs */
 	spin_lock_irqsave(&btv->s_lock,flags);
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 3abb2a739..3f1cc2a32 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -1442,7 +1442,11 @@ 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);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static int msp_suspend(struct device * dev, u32 state, u32 level);
+#else
+static int msp_suspend(struct device * dev, pm_message_t state, u32 level);
+#endif
 static int msp_resume(struct device * dev, u32 level);
 
 static void msp_wake_thread(struct i2c_client *client);
@@ -1847,7 +1851,11 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static int msp_suspend(struct device * dev, u32 state, u32 level)
+#else
+static int msp_suspend(struct device * dev, pm_message_t state, u32 level)
+#endif
 {
 	struct i2c_client *c = container_of(dev, struct i2c_client, dev);
 
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 3abb2a739..3f1cc2a32 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -1442,7 +1442,11 @@ 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);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static int msp_suspend(struct device * dev, u32 state, u32 level);
+#else
+static int msp_suspend(struct device * dev, pm_message_t state, u32 level);
+#endif
 static int msp_resume(struct device * dev, u32 level);
 
 static void msp_wake_thread(struct i2c_client *client);
@@ -1847,7 +1851,11 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static int msp_suspend(struct device * dev, u32 state, u32 level)
+#else
+static int msp_suspend(struct device * dev, pm_message_t state, u32 level)
+#endif
 {
 	struct i2c_client *c = container_of(dev, struct i2c_client, dev);
 
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index 22b640cab..bc2c4badf 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -791,7 +791,11 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
 static int tda9887_suspend(struct device * dev, u32 state, u32 level)
+#else
+static int tda9887_suspend(struct device * dev, pm_message_t state, u32 level)
+#endif
 {
 	dprintk("tda9887: suspend\n");
 	return 0;
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 8c5ffb35d..eac0b83bb 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tuner-core.c,v 1.58 2005/07/14 03:06:43 mchehab Exp $
+ * $Id: tuner-core.c,v 1.59 2005/07/15 20:09:38 mchehab Exp $
  *
  * i2c tv tuner chip device driver
  * core core, i.e. kernel interfaces, registering and so on
@@ -655,7 +655,11 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	return 0;
 }
 
-static int tuner_suspend(struct device *dev, u32 state, u32 level)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
+static int tuner_suspend(struct device * dev, u32 state, u32 level)
+#else
+static int tuner_suspend(struct device * dev, pm_message_t state, u32 level)
+#endif
 {
 	struct i2c_client *c = container_of (dev, struct i2c_client, dev);
 	struct tuner *t = i2c_get_clientdata (c);