Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

This fixes u32 vs. pm_message_t in drivers/mmc, drivers/mtd and
drivers/scsi.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Pavel Machek and committed by
Linus Torvalds
e5378ca8 8d189f72

+11 -11
+1 -1
drivers/mmc/mmc.c
··· 884 884 * @host: mmc host 885 885 * @state: suspend mode (PM_SUSPEND_xxx) 886 886 */ 887 - int mmc_suspend_host(struct mmc_host *host, u32 state) 887 + int mmc_suspend_host(struct mmc_host *host, pm_message_t state) 888 888 { 889 889 mmc_claim_host(host); 890 890 mmc_deselect_cards(host);
+1 -1
drivers/mmc/mmci.c
··· 603 603 } 604 604 605 605 #ifdef CONFIG_PM 606 - static int mmci_suspend(struct amba_device *dev, u32 state) 606 + static int mmci_suspend(struct amba_device *dev, pm_message_t state) 607 607 { 608 608 struct mmc_host *mmc = amba_get_drvdata(dev); 609 609 int ret = 0;
+1 -1
drivers/mmc/pxamci.c
··· 558 558 } 559 559 560 560 #ifdef CONFIG_PM 561 - static int pxamci_suspend(struct device *dev, u32 state, u32 level) 561 + static int pxamci_suspend(struct device *dev, pm_message_t state, u32 level) 562 562 { 563 563 struct mmc_host *mmc = dev_get_drvdata(dev); 564 564 int ret = 0;
+1 -1
drivers/mmc/wbsd.c
··· 1563 1563 */ 1564 1564 1565 1565 #ifdef CONFIG_PM 1566 - static int wbsd_suspend(struct device *dev, u32 state, u32 level) 1566 + static int wbsd_suspend(struct device *dev, pm_message_t state, u32 level) 1567 1567 { 1568 1568 DBGF("Not yet supported\n"); 1569 1569
+1 -1
drivers/mtd/maps/sa1100-flash.c
··· 403 403 } 404 404 405 405 #ifdef CONFIG_PM 406 - static int sa1100_mtd_suspend(struct device *dev, u32 state, u32 level) 406 + static int sa1100_mtd_suspend(struct device *dev, pm_message_t state, u32 level) 407 407 { 408 408 struct sa_info *info = dev_get_drvdata(dev); 409 409 int ret = 0;
+1 -1
drivers/scsi/mesh.c
··· 1757 1757 1758 1758 1759 1759 #ifdef CONFIG_PM 1760 - static int mesh_suspend(struct macio_dev *mdev, u32 state) 1760 + static int mesh_suspend(struct macio_dev *mdev, pm_message_t state) 1761 1761 { 1762 1762 struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev); 1763 1763 unsigned long flags;
+5 -5
drivers/scsi/nsp32.c
··· 3435 3435 #ifdef CONFIG_PM 3436 3436 3437 3437 /* Device suspended */ 3438 - static int nsp32_suspend(struct pci_dev *pdev, u32 state) 3438 + static int nsp32_suspend(struct pci_dev *pdev, pm_message_t state) 3439 3439 { 3440 3440 struct Scsi_Host *host = pci_get_drvdata(pdev); 3441 3441 ··· 3443 3443 3444 3444 pci_save_state (pdev); 3445 3445 pci_disable_device (pdev); 3446 - pci_set_power_state(pdev, state); 3446 + pci_set_power_state(pdev, pci_choose_state(pdev, state)); 3447 3447 3448 3448 return 0; 3449 3449 } ··· 3457 3457 3458 3458 nsp32_msg(KERN_INFO, "pci-resume: pdev=0x%p, slot=%s, host=0x%p", pdev, pci_name(pdev), host); 3459 3459 3460 - pci_set_power_state(pdev, 0); 3461 - pci_enable_wake (pdev, 0, 0); 3460 + pci_set_power_state(pdev, PCI_D0); 3461 + pci_enable_wake (pdev, PCI_D0, 0); 3462 3462 pci_restore_state (pdev); 3463 3463 3464 3464 reg = nsp32_read2(data->BaseAddress, INDEX_REG); ··· 3479 3479 } 3480 3480 3481 3481 /* Enable wake event */ 3482 - static int nsp32_enable_wake(struct pci_dev *pdev, u32 state, int enable) 3482 + static int nsp32_enable_wake(struct pci_dev *pdev, pci_power_t state, int enable) 3483 3483 { 3484 3484 struct Scsi_Host *host = pci_get_drvdata(pdev); 3485 3485