fix u32 vs. pm_message_t in drivers/mmc,mtd,scsi

fix u32 vs. pm_message_t in drivers/mmc,mtd,scsi

[Pavel Machek]

Hi!

This fixes u32 vs. pm_message_t in drivers/mmc, drivers/mtd and
drivers/scsi. [These patches are independend and change no object
code; therefore not numbered].

This is last of the series. I tried to submit patches through their
mainainers (when they were easy to determine, our MAINTAINERS file
sucks). Unfortunately that probably means some patches will fail to
propagate and I'll have to fix up after -rc2 or something. Hopefully
diff will be fairly small by that time.

Please apply,

Signed-off-by: Pavel Machek <pavel@suse.cz>
                                                        Pavel

--- clean-cvs/drivers/mmc/mmc.c	2005-01-04 11:40:44.000000000 +0100
+++ linux-cvs/drivers/mmc/mmc.c	2005-03-31 23:54:45.000000000 +0200
@@ -884,7 +884,7 @@
  *	@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);
--- clean-cvs/drivers/mmc/mmci.c	2005-01-11 01:37:06.000000000 +0100
+++ linux-cvs/drivers/mmc/mmci.c	2005-03-31 23:54:46.000000000 +0200
@@ -603,7 +603,7 @@
 }
 
 #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;
--- clean-cvs/drivers/mmc/pxamci.c	2005-03-29 13:29:59.000000000 +0200
+++ linux-cvs/drivers/mmc/pxamci.c	2005-03-31 23:54:46.000000000 +0200
@@ -558,7 +558,7 @@
 }
 
 #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;
--- clean-cvs/drivers/mmc/wbsd.c	2005-01-31 00:27:36.000000000 +0100
+++ linux-cvs/drivers/mmc/wbsd.c	2005-03-31 23:54:46.000000000 +0200
@@ -1563,7 +1563,7 @@
  */
 
 #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");
 
--- clean-cvs/drivers/mtd/maps/sa1100-flash.c	2004-11-19 12:19:52.000000000 +0100
+++ linux-cvs/drivers/mtd/maps/sa1100-flash.c	2005-03-31 23:54:46.000000000 +0200
@@ -403,7 +403,7 @@
 }
 
 #ifdef CONFIG_PM
-static int sa1100_mtd_suspend(struct device *dev, u32 state, u32 level)
+static int sa1100_mtd_suspend(struct device *dev, pm_message_t state, u32 level)
 {
 	struct sa_info *info = dev_get_drvdata(dev);
 	int ret = 0;
 
--- clean-cvs/drivers/scsi/mesh.c	2004-12-09 21:46:11.000000000 +0100
+++ linux-cvs/drivers/scsi/mesh.c	2005-03-31 23:54:47.000000000 +0200
@@ -1757,7 +1757,7 @@
 
 
 #ifdef CONFIG_PM
-static int mesh_suspend(struct macio_dev *mdev, u32 state)
+static int mesh_suspend(struct macio_dev *mdev, pm_message_t state)
 {
 	struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev);
 	unsigned long flags;
--- clean-cvs/drivers/scsi/nsp32.c	2005-01-11 01:37:23.000000000 +0100
+++ linux-cvs/drivers/scsi/nsp32.c	2005-03-31 23:54:47.000000000 +0200
@@ -3435,7 +3435,7 @@
 #ifdef CONFIG_PM
 
 /* Device suspended */
-static int nsp32_suspend(struct pci_dev *pdev, u32 state)
+static int nsp32_suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	struct Scsi_Host *host = pci_get_drvdata(pdev);
 
@@ -3443,7 +3443,7 @@
 
 	pci_save_state     (pdev);
 	pci_disable_device (pdev);
-	pci_set_power_state(pdev, state);
+	pci_set_power_state(pdev, pci_choose_state(pdev, state));
 
 	return 0;
 }
@@ -3457,8 +3457,8 @@
 
 	nsp32_msg(KERN_INFO, "pci-resume: pdev=0x%p, slot=%s, host=0x%p", pdev, pci_name(pdev), host);
 
-	pci_set_power_state(pdev, 0);
-	pci_enable_wake    (pdev, 0, 0);
+	pci_set_power_state(pdev, PCI_D0);
+	pci_enable_wake    (pdev, PCI_D0, 0);
 	pci_restore_state  (pdev);
 
 	reg = nsp32_read2(data->BaseAddress, INDEX_REG);
@@ -3479,7 +3479,7 @@
 }
 
 /* Enable wake event */
-static int nsp32_enable_wake(struct pci_dev *pdev, u32 state, int enable)
+static int nsp32_enable_wake(struct pci_dev *pdev, pci_power_t state, int enable)
 {
 	struct Scsi_Host *host = pci_get_drvdata(pdev);
 

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

Re: fix u32 vs. pm_message_t in drivers/mmc,mtd,scsi

[Andrew Morton]

Pavel Machek <pavel@ucw.cz> wrote:
>
>  This is last of the series. I tried to submit patches through their
>  mainainers (when they were easy to determine, our MAINTAINERS file
>  sucks).

You mean that there are patches in addition to these seven?

>  Unfortunately that probably means some patches will fail to
>  propagate and I'll have to fix up after -rc2 or something. Hopefully
>  diff will be fairly small by that time.

This sort of thing is a pain all round whichever way we do it.  Right now
the various subsystem trees are about as small as they ever get, so the
time is good to push all this in.

You should go through the whole -mm, check to see whether there is work
pending in bk-*.patch which also needs conversion.

Re: fix u32 vs. pm_message_t in drivers/mmc,mtd,scsi

[Pavel Machek]

Hi!

> >  This is last of the series. I tried to submit patches through their
> >  mainainers (when they were easy to determine, our MAINTAINERS file
> >  sucks).
> 
> You mean that there are patches in addition to these seven?

Yes, there are 7 more. They were sent to l-k and maintainers. I'll
bounce them to you.

> This sort of thing is a pain all round whichever way we do it.  Right now
> the various subsystem trees are about as small as they ever get, so the
> time is good to push all this in.
> 
> You should go through the whole -mm, check to see whether there is work
> pending in bk-*.patch which also needs conversion.

Ok, I'll do some grepping (tommorow or monday).
								Pavel
									

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