mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
[PATCH] fix u32 vs. pm_message_t in driver/video
This fixes u32 vs. pm_message_t confusion in drivers/video. Should change no code. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
0370affeec
commit
9bfd354b1b
|
@ -81,7 +81,7 @@ static void corgibl_blank(int blank)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
static int corgibl_suspend(struct device *dev, u32 state, u32 level)
|
static int corgibl_suspend(struct device *dev, pm_message_t state, u32 level)
|
||||||
{
|
{
|
||||||
if (level == SUSPEND_POWER_DOWN)
|
if (level == SUSPEND_POWER_DOWN)
|
||||||
corgibl_blank(FB_BLANK_POWERDOWN);
|
corgibl_blank(FB_BLANK_POWERDOWN);
|
||||||
|
|
|
@ -942,7 +942,7 @@ pxafb_freq_policy(struct notifier_block *nb, unsigned long val, void *data)
|
||||||
* Power management hooks. Note that we won't be called from IRQ context,
|
* Power management hooks. Note that we won't be called from IRQ context,
|
||||||
* unlike the blank functions above, so we may sleep.
|
* unlike the blank functions above, so we may sleep.
|
||||||
*/
|
*/
|
||||||
static int pxafb_suspend(struct device *dev, u32 state, u32 level)
|
static int pxafb_suspend(struct device *dev, pm_message_t state, u32 level)
|
||||||
{
|
{
|
||||||
struct pxafb_info *fbi = dev_get_drvdata(dev);
|
struct pxafb_info *fbi = dev_get_drvdata(dev);
|
||||||
|
|
||||||
|
|
|
@ -1307,7 +1307,7 @@ sa1100fb_freq_policy(struct notifier_block *nb, unsigned long val,
|
||||||
* Power management hooks. Note that we won't be called from IRQ context,
|
* Power management hooks. Note that we won't be called from IRQ context,
|
||||||
* unlike the blank functions above, so we may sleep.
|
* unlike the blank functions above, so we may sleep.
|
||||||
*/
|
*/
|
||||||
static int sa1100fb_suspend(struct device *dev, u32 state, u32 level)
|
static int sa1100fb_suspend(struct device *dev, pm_message_t state, u32 level)
|
||||||
{
|
{
|
||||||
struct sa1100fb_info *fbi = dev_get_drvdata(dev);
|
struct sa1100fb_info *fbi = dev_get_drvdata(dev);
|
||||||
|
|
||||||
|
|
|
@ -2103,7 +2103,7 @@ static void __devexit savagefb_remove (struct pci_dev *dev)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int savagefb_suspend (struct pci_dev* dev, u32 state)
|
static int savagefb_suspend (struct pci_dev* dev, pm_message_t state)
|
||||||
{
|
{
|
||||||
struct fb_info *info =
|
struct fb_info *info =
|
||||||
(struct fb_info *)pci_get_drvdata(dev);
|
(struct fb_info *)pci_get_drvdata(dev);
|
||||||
|
@ -2118,7 +2118,7 @@ static int savagefb_suspend (struct pci_dev* dev, u32 state)
|
||||||
release_console_sem();
|
release_console_sem();
|
||||||
|
|
||||||
pci_disable_device(dev);
|
pci_disable_device(dev);
|
||||||
pci_set_power_state(dev, state);
|
pci_set_power_state(dev, pci_choose_state(dev, state));
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -544,7 +544,7 @@ static void w100fb_clear_buffer(void)
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
static int w100fb_suspend(struct device *dev, u32 state, u32 level)
|
static int w100fb_suspend(struct device *dev, pm_message_t state, u32 level)
|
||||||
{
|
{
|
||||||
if (level == SUSPEND_POWER_DOWN) {
|
if (level == SUSPEND_POWER_DOWN) {
|
||||||
struct fb_info *info = dev_get_drvdata(dev);
|
struct fb_info *info = dev_get_drvdata(dev);
|
||||||
|
|
Loading…
Reference in a new issue