fix u32 vs. pm_message_t in driver/video
Subsystems (2)
Hi!
This fixes u32 vs. pm_message_t confusion in drivers/video. Should change no code. Please apply,
Pavel
Signed-off-by Pavel Machek <[email protected]>
drivers/video/backlight/corgi_bl.c +1 -1
@@ -81,7 +81,7 @@ }#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 )corgibl_blank (FB_BLANK_POWERDOWN );
drivers/video/pxafb.c +1 -1
@@ -942,7 +942,7 @@* Power management hooks. Note that we won't be called from IRQ context, * 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);
drivers/video/sa1100fb.c +1 -1
@@ -1307,7 +1307,7 @@* Power management hooks. Note that we won't be called from IRQ context, * 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);
drivers/video/savage/savagefb_driver.c +2 -2
@@ -2103,7 +2103,7 @@ } } -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 *)pci_get_drvdata (dev);
@@ -2118,7 +2118,7 @@release_console_sem ();pci_disable_device (dev); -pci_set_power_state (dev, state); +pci_set_power_state (dev,pci_choose_state (dev, state));return 0 ; }
drivers/video/w100fb.c +1 -1
@@ -544,7 +544,7 @@#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 ) {struct fb_info *info =dev_get_drvdata (dev);
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!