From: Daniel Drake <dsd@gentoo.org>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, linux-pm@osdl.org
Subject: [-mm PATCH] driver model: PM type conversions in drivers/mmc
Date: Fri, 04 Feb 2005 22:10:35 +0000 [thread overview]
Message-ID: <4203F2DB.9010604@gentoo.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 127 bytes --]
This fixes PM driver model type checking for drivers/mmc.
Acked by Pavel Machek.
Signed-off-by: Daniel Drake <dsd@gentoo.org>
[-- Attachment #2: mmc-pm-type-safety.patch --]
[-- Type: text/x-patch, Size: 2711 bytes --]
diff -urNpX dontdiff linux-2.6.11-rc2-mm2/drivers/mmc/mmc.c linux-dsd/drivers/mmc/mmc.c
--- linux-2.6.11-rc2-mm2/drivers/mmc/mmc.c 2005-02-02 21:54:17.000000000 +0000
+++ linux-dsd/drivers/mmc/mmc.c 2005-02-02 21:26:44.000000000 +0000
@@ -884,7 +884,7 @@ EXPORT_SYMBOL(mmc_free_host);
* @host: mmc host
* @state: suspend mode (PM_SUSPEND_xxx)
*/
-int mmc_suspend_host(struct mmc_host *host, u32 state)
+int mmc_suspend_host(struct mmc_host *host, pm_message_t state)
{
mmc_claim_host(host);
mmc_deselect_cards(host);
diff -urNpX dontdiff linux-2.6.11-rc2-mm2/drivers/mmc/mmci.c linux-dsd/drivers/mmc/mmci.c
--- linux-2.6.11-rc2-mm2/drivers/mmc/mmci.c 2005-02-02 21:54:17.000000000 +0000
+++ linux-dsd/drivers/mmc/mmci.c 2005-02-02 21:27:17.000000000 +0000
@@ -603,7 +603,7 @@ static int mmci_remove(struct amba_devic
}
#ifdef CONFIG_PM
-static int mmci_suspend(struct amba_device *dev, u32 state)
+static int mmci_suspend(struct amba_device *dev, pm_message_t state)
{
struct mmc_host *mmc = amba_get_drvdata(dev);
int ret = 0;
diff -urNpX dontdiff linux-2.6.11-rc2-mm2/drivers/mmc/pxamci.c linux-dsd/drivers/mmc/pxamci.c
--- linux-2.6.11-rc2-mm2/drivers/mmc/pxamci.c 2005-02-02 21:54:17.000000000 +0000
+++ linux-dsd/drivers/mmc/pxamci.c 2005-02-02 21:27:33.000000000 +0000
@@ -558,7 +558,7 @@ static int pxamci_remove(struct device *
}
#ifdef CONFIG_PM
-static int pxamci_suspend(struct device *dev, u32 state, u32 level)
+static int pxamci_suspend(struct device *dev, pm_message_t state, u32 level)
{
struct mmc_host *mmc = dev_get_drvdata(dev);
int ret = 0;
diff -urNpX dontdiff linux-2.6.11-rc2-mm2/drivers/mmc/wbsd.c linux-dsd/drivers/mmc/wbsd.c
--- linux-2.6.11-rc2-mm2/drivers/mmc/wbsd.c 2005-02-02 21:54:17.000000000 +0000
+++ linux-dsd/drivers/mmc/wbsd.c 2005-02-02 21:28:50.000000000 +0000
@@ -1563,7 +1563,7 @@ static int wbsd_remove(struct device* de
*/
#ifdef CONFIG_PM
-static int wbsd_suspend(struct device *dev, u32 state, u32 level)
+static int wbsd_suspend(struct device *dev, pm_message_t state, u32 level)
{
DBGF("Not yet supported\n");
diff -urNpX dontdiff linux-2.6.11-rc2-mm2/include/linux/mmc/host.h linux-dsd/include/linux/mmc/host.h
--- linux-2.6.11-rc2-mm2/include/linux/mmc/host.h 2004-12-24 21:34:58.000000000 +0000
+++ linux-dsd/include/linux/mmc/host.h 2005-02-02 21:26:34.000000000 +0000
@@ -98,7 +98,7 @@ extern void mmc_free_host(struct mmc_hos
#define mmc_priv(x) ((void *)((x) + 1))
#define mmc_dev(x) ((x)->dev)
-extern int mmc_suspend_host(struct mmc_host *, u32);
+extern int mmc_suspend_host(struct mmc_host *, pm_message_t);
extern int mmc_resume_host(struct mmc_host *);
extern void mmc_detect_change(struct mmc_host *);
reply other threads:[~2005-02-04 22:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4203F2DB.9010604@gentoo.org \
--to=dsd@gentoo.org \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.