Fix u32 vs. pm_message_t confusion in PCMCIA

[Pavel Machek <pavel@suse.cz>]

Hi!

This should fix part of u32 vs. pm_message_t confusion in
pcmcia. PCMCIA is listed as unmaintained, that's why it goes
directly...

								Pavel

--- clean-mm/drivers/pcmcia/cs.c	2005-02-15 00:34:39.000000000 +0100
+++ linux-mm/drivers/pcmcia/cs.c	2005-02-15 01:04:10.000000000 +0100
@@ -140,7 +140,7 @@
 static int socket_resume(struct pcmcia_socket *skt);
 static int socket_suspend(struct pcmcia_socket *skt);
 
-int pcmcia_socket_dev_suspend(struct device *dev, u32 state)
+int pcmcia_socket_dev_suspend(struct device *dev, pm_message_t state)
 {
 	struct pcmcia_socket *socket;
 
--- clean-mm/drivers/pcmcia/i82092.c	2005-02-15 00:34:39.000000000 +0100
+++ linux-mm/drivers/pcmcia/i82092.c	2005-02-15 01:04:10.000000000 +0100
@@ -42,7 +42,7 @@
 };
 MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids);
 
-static int i82092aa_socket_suspend (struct pci_dev *dev, u32 state)
+static int i82092aa_socket_suspend (struct pci_dev *dev, pm_message_t state)
 {
 	return pcmcia_socket_dev_suspend(&dev->dev, state);
 }
--- clean-mm/drivers/pcmcia/i82365.c	2005-02-15 00:46:41.000000000 +0100
+++ linux-mm/drivers/pcmcia/i82365.c	2005-02-15 01:04:10.000000000 +0100
@@ -1339,7 +1339,7 @@
 
 /*====================================================================*/
 
-static int i82365_suspend(struct device *dev, u32 state, u32 level)
+static int i82365_suspend(struct device *dev, pm_message_t state, u32 level)
 {
 	int ret = 0;
 	if (level == SUSPEND_SAVE_STATE)
--- clean-mm/drivers/pcmcia/pd6729.c	2005-02-15 00:34:39.000000000 +0100
+++ linux-mm/drivers/pcmcia/pd6729.c	2005-02-15 01:04:10.000000000 +0100
@@ -833,7 +833,7 @@
 	kfree(socket);
 }
 
-static int pd6729_socket_suspend(struct pci_dev *dev, u32 state)
+static int pd6729_socket_suspend(struct pci_dev *dev, pm_message_t state)
 {
 	return pcmcia_socket_dev_suspend(&dev->dev, state);
 }
--- clean-mm/drivers/pcmcia/tcic.c	2005-02-15 00:34:39.000000000 +0100
+++ linux-mm/drivers/pcmcia/tcic.c	2005-02-15 01:04:10.000000000 +0100
@@ -373,7 +373,7 @@
 
 /*====================================================================*/
 
-static int tcic_drv_suspend(struct device *dev, u32 state, u32 level)
+static int tcic_drv_suspend(struct device *dev, pm_message_t state, u32 level)
 {
 	int ret = 0;
 	if (level == SUSPEND_SAVE_STATE)
--- clean-mm/drivers/pcmcia/yenta_socket.c	2005-02-15 00:46:41.000000000 +0100
+++ linux-mm/drivers/pcmcia/yenta_socket.c	2005-02-15 01:04:10.000000000 +0100
@@ -1019,7 +1019,7 @@
 }
 
 
-static int yenta_dev_suspend (struct pci_dev *dev, u32 state)
+static int yenta_dev_suspend (struct pci_dev *dev, pm_message_t state)
 {
 	struct yenta_socket *socket = pci_get_drvdata(dev);
 	int ret;
--- clean-mm/include/pcmcia/ss.h	2005-02-15 00:34:41.000000000 +0100
+++ linux-mm/include/pcmcia/ss.h	2005-02-15 01:04:11.000000000 +0100
@@ -248,7 +248,7 @@
 extern struct class pcmcia_socket_class;
 
 /* socket drivers are expected to use these callbacks in their .drv struct */
-extern int pcmcia_socket_dev_suspend(struct device *dev, u32 state);
+extern int pcmcia_socket_dev_suspend(struct device *dev, pm_message_t state);
 extern int pcmcia_socket_dev_resume(struct device *dev);
 
 #endif /* _LINUX_SS_H */
 

-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!