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

Commit 3bfffd97 authored Apr 16, 2005 by Pavel Machek Committed by Linus Torvalds Apr 16, 2005

[PATCH] fix u32 vs. pm_message_t in rest of the tree



This fixes u32 vs.  pm_message_t confusion in remaining places.  Fortunately
there's few of them.

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

parent 9bfd354b

arch/sh/kernel/cpu/bus.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@ static int sh_bus_match(struct device dev, struct device_driver drv)
	return shdev->dev_id == shdrv->dev_id;		return shdev->dev_id == shdrv->dev_id;
	}		}

	static int sh_bus_suspend(struct device *dev, u32 state)		static int sh_bus_suspend(struct device *dev, pm_message_t state)
	{		{
	struct sh_dev *shdev = to_sh_dev(dev);		struct sh_dev *shdev = to_sh_dev(dev);
	struct sh_driver *shdrv = to_sh_driver(dev->driver);		struct sh_driver *shdrv = to_sh_driver(dev->driver);

drivers/ide/pci/sc1200.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -346,7 +346,7 @@ typedef struct sc1200_saved_state_s {
	} sc1200_saved_state_t;		} sc1200_saved_state_t;


	static int sc1200_suspend (struct pci_dev *dev, u32 state)		static int sc1200_suspend (struct pci_dev *dev, pm_message_t state)
	{		{
	ide_hwif_t *hwif = NULL;		ide_hwif_t *hwif = NULL;

drivers/macintosh/via-pmu.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3052,7 +3052,7 @@ pmu_polled_request(struct adb_request *req)

	static int pmu_sys_suspended = 0;		static int pmu_sys_suspended = 0;

	static int pmu_sys_suspend(struct sys_device *sysdev, u32 state)		static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state)
	{		{
	if (state != PM_SUSPEND_DISK \|\| pmu_sys_suspended)		if (state != PM_SUSPEND_DISK \|\| pmu_sys_suspended)
	return 0;		return 0;

include/asm-sh/bus-sh.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,7 @@ struct sh_driver {
	unsigned int bus_id;		unsigned int bus_id;
	int (probe)(struct sh_dev );		int (probe)(struct sh_dev );
	int (remove)(struct sh_dev );		int (remove)(struct sh_dev );
	int (suspend)(struct sh_dev , u32);		int (suspend)(struct sh_dev , pm_message_t);
	int (resume)(struct sh_dev );		int (resume)(struct sh_dev );
	};		};

include/linux/mmc/host.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -98,7 +98,7 @@ extern void mmc_free_host(struct mmc_host *);
	#define mmc_priv(x) ((void *)((x) + 1))		#define mmc_priv(x) ((void *)((x) + 1))
	#define mmc_dev(x) ((x)->dev)		#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 int mmc_resume_host(struct mmc_host *);

	extern void mmc_detect_change(struct mmc_host *);		extern void mmc_detect_change(struct mmc_host *);