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

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

[PATCH] fix u32 vs. pm_message_t in drivers/macintosh 



I thought I'm done with fixing u32 vs.  pm_message_t ...  unfortunately that
turned out not to be the case as Russel King pointed out.  Here are fixes for
drivers/macintosh.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0b9c33a7

drivers/macintosh/macio_asic.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void macio_device_shutdown(struct device *dev) 
		drv->shutdown(macio_dev);

}



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

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

{

	struct macio_dev * macio_dev = to_macio_device(dev);

	struct macio_driver * drv = to_macio_driver(dev->driver);

drivers/macintosh/mediabay.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_ma 


}



static int __pmac media_bay_suspend(struct macio_dev *mdev, u32 state)

static int __pmac media_bay_suspend(struct macio_dev *mdev, pm_message_t state)

{

	struct media_bay_info	*bay = macio_get_drvdata(mdev);