Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 829ca9a3 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

[PATCH] swsusp: fix remaining u32 vs. pm_message_t confusion 



Fix remaining bits of u32 vs.  pm_message confusion.  Should not break
anything.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7e958883

arch/i386/kernel/cpu/mtrr/main.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ struct mtrr_value { 


static struct mtrr_value * mtrr_state;



static int mtrr_save(struct sys_device * sysdev, u32 state)

static int mtrr_save(struct sys_device * sysdev, pm_message_t state)

{

	int i;

	int size = num_var_ranges * sizeof(struct mtrr_value);

arch/ppc/platforms/pmac_pic.c

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ static int pmacpic_find_viaint(void) 
	return viaint;

}



static int pmacpic_suspend(struct sys_device *sysdev, u32 state)

static int pmacpic_suspend(struct sys_device *sysdev, pm_message_t state)

{

	int viaint = pmacpic_find_viaint();

arch/ppc/syslib/open_pic.c

+1 −1
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ static void openpic_cached_disable_irq(u_int irq) 
 * we need something better to deal with that... Maybe switch to S1 for

 * cpufreq changes

 */

int openpic_suspend(struct sys_device *sysdev, u32 state)

int openpic_suspend(struct sys_device *sysdev, pm_message_t state)

{

	int	i;

	unsigned long flags;

arch/x86_64/kernel/nmi.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ void enable_timer_nmi_watchdog(void) 


static int nmi_pm_active; /* nmi_active before suspend */



static int lapic_nmi_suspend(struct sys_device *dev, u32 state)

static int lapic_nmi_suspend(struct sys_device *dev, pm_message_t state)

{

	nmi_pm_active = nmi_active;

	disable_lapic_nmi_watchdog();

drivers/ide/ppc/pmac.c

+4 −4
Original line number Diff line number Diff line
@@ -1504,7 +1504,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) 
}



static int

pmac_ide_macio_suspend(struct macio_dev *mdev, u32 state)

pmac_ide_macio_suspend(struct macio_dev *mdev, pm_message_t state)

{

	ide_hwif_t	*hwif = (ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev);

	int		rc = 0;
@@ -1527,7 +1527,7 @@ pmac_ide_macio_resume(struct macio_dev *mdev) 
	if (mdev->ofdev.dev.power.power_state != 0) {

		rc = pmac_ide_do_resume(hwif);

		if (rc == 0)

			mdev->ofdev.dev.power.power_state = 0;

			mdev->ofdev.dev.power.power_state = PMSG_ON;

	}



	return rc;
@@ -1608,7 +1608,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id) 
}



static int

pmac_ide_pci_suspend(struct pci_dev *pdev, u32 state)

pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t state)

{

	ide_hwif_t	*hwif = (ide_hwif_t *)pci_get_drvdata(pdev);

	int		rc = 0;
@@ -1631,7 +1631,7 @@ pmac_ide_pci_resume(struct pci_dev *pdev) 
	if (pdev->dev.power.power_state != 0) {

		rc = pmac_ide_do_resume(hwif);

		if (rc == 0)

			pdev->dev.power.power_state = 0;

			pdev->dev.power.power_state = PMSG_ON;

	}



	return rc;