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/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: 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
f4513904 0b9c33a7

+2 -2
+1 -1
drivers/macintosh/macio_asic.c
··· 106 106 drv->shutdown(macio_dev); 107 107 } 108 108 109 - static int macio_device_suspend(struct device *dev, u32 state) 109 + static int macio_device_suspend(struct device *dev, pm_message_t state) 110 110 { 111 111 struct macio_dev * macio_dev = to_macio_device(dev); 112 112 struct macio_driver * drv = to_macio_driver(dev->driver);
+1 -1
drivers/macintosh/mediabay.c
··· 704 704 705 705 } 706 706 707 - static int __pmac media_bay_suspend(struct macio_dev *mdev, u32 state) 707 + static int __pmac media_bay_suspend(struct macio_dev *mdev, pm_message_t state) 708 708 { 709 709 struct media_bay_info *bay = macio_get_drvdata(mdev); 710 710