Fix few remaining u32 vs. pm_message_t issues
Subsystems (7)
Hi!
-mm is pretty good in u32 vs. pm_message_t area, there are only few -places missing. Some of them are in usb (and already on their way -through greg), this should fix the rest. Only code change is -pci_choose_state in savagefb. Please apply,
Pavel
Signed-off-by Pavel Machek <[email protected]>
drivers/base/power/runtime.c +1 -1
@@ -16,7 +16,7 @@if (!dev->power.power_state)return ;if (!resume_device (dev)) - dev->power.power_state =0 ; + dev->power.power_state =PMSG_ON ; }
drivers/base/power/sysfs.c +1 -1
@@ -31,7 +31,7 @@static ssize_t state_store (struct device * dev,const char * buf,size_t n) { -u32 state; +pm_message_t state;char * rest;int error =0 ;
Only in linux-mm/drivers/char: consolemap_deftbl.c
drivers/ide/ide-disk.c +1 -1
@@ -1098,7 +1098,7 @@ }printk ("Shutdown: %s\n" , drive->name); - dev->bus->suspend (dev,PM_SUSPEND_STANDBY ); + dev->bus->suspend (dev,PMSG_SUSPEND ); }/*
drivers/media/video/msp3400.c +2 -2
@@ -1422,7 +1422,7 @@static int msp_probe (struct i2c_adapter *adap);static int msp_command (struct i2c_client *client,unsigned int cmd,void *arg); -static int msp_suspend (struct device * dev,u32 state,u32 level); +static int msp_suspend (struct device * dev,pm_message_t state,u32 level);static int msp_resume (struct device * dev,u32 level);static void msp_wake_thread (struct i2c_client *client);
@@ -1830,7 +1830,7 @@return 0 ; } -static int msp_suspend (struct device * dev,u32 state,u32 level) +static int msp_suspend (struct device * dev,pm_message_t state,u32 level) { struct i2c_client *c = container_of(dev, struct i2c_client, dev);
drivers/pci/pci.c +3 -2
@@ -312,13 +312,14 @@/** * pci_choose_state - Choose the power state of a PCI device * @dev: PCI device to be suspended -* @state: target sleep state for the whole system +* @state: target sleep state for the whole system. This is the value +* that is passed to suspend() function. * * Returns PCI power state suitable for given device and given system * message. */ -pci_power_t pci_choose_state (struct pci_dev *dev,u32 state) +pci_power_t pci_choose_state (struct pci_dev *dev,pm_message_t state) {if (!pci_find_capability (dev,PCI_CAP_ID_PM ))return PCI_D0 ;
drivers/video/i810/i810_main.c +1 -1
@@ -1492,7 +1492,7 @@/*********************************************************************** * Power Management * ***********************************************************************/ -static int i810fb_suspend (struct pci_dev *dev,u32 state) +static int i810fb_suspend (struct pci_dev *dev,pm_message_t state) {struct fb_info *info =pci_get_drvdata (dev);struct i810fb_par *par = (struct i810fb_par *) info->par;
drivers/video/savage/savagefb.c +2 -2
@@ -2100,7 +2100,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);
@@ -2115,7 +2115,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 ; }
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!
Review
Quoted 6 lines · Pavel Machek
Hi!
(quoted diff) +0
-4-mm is pretty good in u32 vs. pm_message_t area, there are only few -places missing. Some of them are in usb (and already on their way -through greg), this should fix the rest. Only code change is -pci_choose_state in savagefb. Please apply,
If you split out the drivers/base/* and the drivers/pci/* ones I'll add those to my trees too.
thanks,
greg k-h
Hi!
Quoted 7 lines
Review
Quoted 4 lines
(quoted diff) +0
-4-mm is pretty good in u32 vs. pm_message_t area, there are only few -places missing. Some of them are in usb (and already on their way -through greg), this should fix the rest. Only code change is -pci_choose_state in savagefb. Please apply,If you split out the
drivers/base/*and thedrivers/pci/*ones I'll add those to my trees too.
Okay, here they are:
Thanks,
Pavel
drivers/base/power/runtime.c +1 -1
@@ -16,7 +16,7 @@if (!dev->power.power_state)return ;if (!resume_device (dev)) - dev->power.power_state =0 ; + dev->power.power_state =PMSG_ON ; }
drivers/base/power/sysfs.c +1 -1
@@ -31,7 +31,7 @@static ssize_t state_store (struct device * dev,const char * buf,size_t n) { -u32 state; +pm_message_t state;char * rest;int error =0 ;
drivers/pci/pci.c +3 -2
@@ -312,13 +312,14 @@/** * pci_choose_state - Choose the power state of a PCI device * @dev: PCI device to be suspended -* @state: target sleep state for the whole system +* @state: target sleep state for the whole system. This is the value +* that is passed to suspend() function. * * Returns PCI power state suitable for given device and given system * message. */ -pci_power_t pci_choose_state (struct pci_dev *dev,u32 state) +pci_power_t pci_choose_state (struct pci_dev *dev,pm_message_t state) {if (!pci_find_capability (dev,PCI_CAP_ID_PM ))return PCI_D0 ;
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!