ChangeSet 1.2209, 2005/03/30 09:44:16-08:00, [EMAIL PROTECTED]
[PATCH] Fix u32 vs. pm_message_t confusion in PCMCIA
This should fix part of u32 vs. pm_message_t confusion in pcmcia.
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
drivers/pcmcia/cs.c | 2 +-
drivers/pcmcia/i82092.c | 2 +-
drivers/pcmcia/i82365.c | 2 +-
drivers/pcmcia/pd6729.c | 2 +-
drivers/pcmcia/tcic.c | 2 +-
drivers/pcmcia/yenta_socket.c | 2 +-
include/pcmcia/ss.h | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff -Nru a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
--- a/drivers/pcmcia/cs.c 2005-03-30 12:12:55 -08:00
+++ b/drivers/pcmcia/cs.c 2005-03-30 12:12:55 -08:00
@@ -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;
diff -Nru a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
--- a/drivers/pcmcia/i82092.c 2005-03-30 12:12:55 -08:00
+++ b/drivers/pcmcia/i82092.c 2005-03-30 12:12:55 -08:00
@@ -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);
}
diff -Nru a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
--- a/drivers/pcmcia/i82365.c 2005-03-30 12:12:55 -08:00
+++ b/drivers/pcmcia/i82365.c 2005-03-30 12:12:55 -08:00
@@ -1333,7 +1333,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)
diff -Nru a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
--- a/drivers/pcmcia/pd6729.c 2005-03-30 12:12:55 -08:00
+++ b/drivers/pcmcia/pd6729.c 2005-03-30 12:12:55 -08:00
@@ -827,7 +827,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);
}
diff -Nru a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c
--- a/drivers/pcmcia/tcic.c 2005-03-30 12:12:55 -08:00
+++ b/drivers/pcmcia/tcic.c 2005-03-30 12:12:55 -08:00
@@ -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)
diff -Nru a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
--- a/drivers/pcmcia/yenta_socket.c 2005-03-30 12:12:55 -08:00
+++ b/drivers/pcmcia/yenta_socket.c 2005-03-30 12:12:55 -08:00
@@ -1017,7 +1017,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;
diff -Nru a/include/pcmcia/ss.h b/include/pcmcia/ss.h
--- a/include/pcmcia/ss.h 2005-03-30 12:12:55 -08:00
+++ b/include/pcmcia/ss.h 2005-03-30 12:12:55 -08:00
@@ -259,7 +259,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 */
-
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
