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

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

[PATCH] u32 vs. pm_message_t in ppc and radeon 



This fixes pm_message_t vs.  u32 confusion in ppc and aty (I *hope* that's
basically radeon code...).  I was not able to test most of these, but I'm
not really changing anything, so it should be okay.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7f4927c1

arch/ppc64/kernel/of_device.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int of_device_remove(struct device *dev) 
	return 0;

}



static int of_device_suspend(struct device *dev, u32 state)

static int of_device_suspend(struct device *dev, pm_message_t state)

{

	struct of_device * of_dev = to_of_device(dev);

	struct of_platform_driver * drv = to_of_platform_driver(dev->driver);

include/asm-ppc/macio.h

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ struct macio_driver 
	int	(*probe)(struct macio_dev* dev, const struct of_match *match);

	int	(*remove)(struct macio_dev* dev);



	int	(*suspend)(struct macio_dev* dev, u32 state);

	int	(*suspend)(struct macio_dev* dev, pm_message_t state);

	int	(*resume)(struct macio_dev* dev);

	int	(*shutdown)(struct macio_dev* dev);

include/asm-ppc/ocp.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ struct ocp_driver { 
	const struct ocp_device_id *id_table;	/* NULL if wants all devices */

	int  (*probe)  (struct ocp_device *dev);	/* New device inserted */

	void (*remove) (struct ocp_device *dev);	/* Device removed (NULL if not a hot-plug capable driver) */

	int  (*suspend) (struct ocp_device *dev, u32 state);	/* Device suspended */

	int  (*suspend) (struct ocp_device *dev, pm_message_t state);	/* Device suspended */

	int  (*resume) (struct ocp_device *dev);	                /* Device woken up */

	struct device_driver driver;

};

include/asm-ppc/of_device.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct of_platform_driver 
	int	(*probe)(struct of_device* dev, const struct of_match *match);

	int	(*remove)(struct of_device* dev);



	int	(*suspend)(struct of_device* dev, u32 state);

	int	(*suspend)(struct of_device* dev, pm_message_t state);

	int	(*resume)(struct of_device* dev);

	int	(*shutdown)(struct of_device* dev);