From: Pavel Machek <pavel@suse.cz>
To: Andrew Morton <akpm@osdl.org>
Cc: ncunningham@cyclades.com, bernard@blackham.com.au,
torvalds@osdl.org, linux-kernel@vger.kernel.org
Subject: Fix u32 vs. pm_message_t confusion in PCMCIA
Date: Tue, 15 Feb 2005 01:46:08 +0100 [thread overview]
Message-ID: <20050215004608.GD5415@elf.ucw.cz> (raw)
In-Reply-To: <20050214134658.324076c9.akpm@osdl.org>
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!
next prev parent reply other threads:[~2005-02-15 0:47 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-02-14 5:43 PATCH: Address lots of pending pm_message_t changes Nigel Cunningham
2005-02-14 21:34 ` Pavel Machek
2005-02-14 21:46 ` Andrew Morton
2005-02-14 21:57 ` Nigel Cunningham
2005-02-14 22:04 ` Pavel Machek
2005-02-14 22:09 ` Nigel Cunningham
2005-02-14 23:41 ` Pavel Machek
2005-02-15 0:15 ` Nigel Cunningham
2005-02-15 0:15 ` Pavel Machek
2005-02-15 0:21 ` Nigel Cunningham
2005-02-15 1:13 ` Bernard Blackham
2005-02-15 0:31 ` Fix pm_message_t in generic code [was Re: PATCH: Address lots of pending pm_message_t changes] Pavel Machek
2005-02-15 0:46 ` Nigel Cunningham
2005-02-15 0:39 ` Fix u32 vs. pm_message_t in USB " Pavel Machek
2005-02-17 23:40 ` Greg KH
2005-02-28 1:24 ` Pavel Machek
2005-02-15 0:41 ` Fix u32 vs. pm_message_t confusion in OSS Pavel Machek
2005-02-15 0:46 ` Pavel Machek [this message]
2005-02-15 0:47 ` FIx u32 vs. pm_message_t confusion in firewire Pavel Machek
2005-02-15 22:12 ` Jody McIntyre
2005-02-15 0:51 ` Fix u32 vs. pm_message_t in network device drivers Pavel Machek
2005-02-15 0:54 ` Fix u32 vs. pm_message_t confusion in framebuffers Pavel Machek
2005-02-15 0:55 ` Fix u32 vs. pm_message_t in i8042.c Pavel Machek
2005-02-15 13:10 ` Vojtech Pavlik
2005-02-15 0:57 ` Fix u32 vs. pm_message_t confusion in MMC Pavel Machek
2005-02-15 0:58 ` Fix u32 vs. pm_message_t confusion in serials Pavel Machek
2005-02-15 1:00 ` Fix u32 vs. pm_message_t in macintosh Pavel Machek
2005-02-15 1:00 ` Fix u32 vs. pm_message_t confusion in bttv Pavel Machek
2005-02-15 1:01 ` Fix u32 vs. pm_message_t confusion in AGP Pavel Machek
2005-02-14 21:46 ` PATCH: Address lots of pending pm_message_t changes Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050215004608.GD5415@elf.ucw.cz \
--to=pavel@suse.cz \
--cc=akpm@osdl.org \
--cc=bernard@blackham.com.au \
--cc=linux-kernel@vger.kernel.org \
--cc=ncunningham@cyclades.com \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox