redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

PM: Use dev_name() in core device suspend and resume routines

Browse source 
Use dev_name() wherever applicable in drivers/base/power/main.c.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki 2010-12-24 15:03:34 +01:00
parent b64959e615
commit 5c1a07ab3e
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/base/power/main.c
View file

@ -88,8 +88,7 @@ void device_pm_unlock(void)
void device_pm_add(struct device *dev) void device_pm_add(struct device *dev)
{ {
pr_debug("PM: Adding info for %s:%s\n", pr_debug("PM: Adding info for %s:%s\n",
dev->bus ? dev->bus->name : "No Bus", dev->bus ? dev->bus->name : "No Bus", dev_name(dev));
kobject_name(&dev->kobj));
mutex_lock(&dpm_list_mtx); mutex_lock(&dpm_list_mtx);
if (dev->parent && dev->parent->power.in_suspend) if (dev->parent && dev->parent->power.in_suspend)
dev_warn(dev, "parent %s should not be sleeping\n", dev_warn(dev, "parent %s should not be sleeping\n",
@ -105,8 +104,7 @@ void device_pm_add(struct device *dev)
void device_pm_remove(struct device *dev) void device_pm_remove(struct device *dev)
{ {
pr_debug("PM: Removing info for %s:%s\n", pr_debug("PM: Removing info for %s:%s\n",
dev->bus ? dev->bus->name : "No Bus", dev->bus ? dev->bus->name : "No Bus", dev_name(dev));
kobject_name(&dev->kobj));
complete_all(&dev->power.completion); complete_all(&dev->power.completion);
mutex_lock(&dpm_list_mtx); mutex_lock(&dpm_list_mtx);
list_del_init(&dev->power.entry); list_del_init(&dev->power.entry);
@ -123,10 +121,8 @@ void device_pm_remove(struct device *dev)
void device_pm_move_before(struct device *deva, struct device *devb) void device_pm_move_before(struct device *deva, struct device *devb)
{ {
pr_debug("PM: Moving %s:%s before %s:%s\n", pr_debug("PM: Moving %s:%s before %s:%s\n",
deva->bus ? deva->bus->name : "No Bus", deva->bus ? deva->bus->name : "No Bus", dev_name(deva),
kobject_name(&deva->kobj), devb->bus ? devb->bus->name : "No Bus", dev_name(devb));
devb->bus ? devb->bus->name : "No Bus",
kobject_name(&devb->kobj));
/* Delete deva from dpm_list and reinsert before devb. */ /* Delete deva from dpm_list and reinsert before devb. */
list_move_tail(&deva->power.entry, &devb->power.entry); list_move_tail(&deva->power.entry, &devb->power.entry);
} }
@ -139,10 +135,8 @@ void device_pm_move_before(struct device *deva, struct device *devb)
void device_pm_move_after(struct device *deva, struct device *devb) void device_pm_move_after(struct device *deva, struct device *devb)
{ {
pr_debug("PM: Moving %s:%s after %s:%s\n", pr_debug("PM: Moving %s:%s after %s:%s\n",
deva->bus ? deva->bus->name : "No Bus", deva->bus ? deva->bus->name : "No Bus", dev_name(deva),
kobject_name(&deva->kobj), devb->bus ? devb->bus->name : "No Bus", dev_name(devb));
devb->bus ? devb->bus->name : "No Bus",
kobject_name(&devb->kobj));
/* Delete deva from dpm_list and reinsert after devb. */ /* Delete deva from dpm_list and reinsert after devb. */
list_move(&deva->power.entry, &devb->power.entry); list_move(&deva->power.entry, &devb->power.entry);
} }
@ -154,8 +148,7 @@ void device_pm_move_after(struct device *deva, struct device *devb)
void device_pm_move_last(struct device *dev) void device_pm_move_last(struct device *dev)
{ {
pr_debug("PM: Moving %s:%s to end of list\n", pr_debug("PM: Moving %s:%s to end of list\n",
dev->bus ? dev->bus->name : "No Bus", dev->bus ? dev->bus->name : "No Bus", dev_name(dev));
kobject_name(&dev->kobj));
list_move_tail(&dev->power.entry, &dpm_list); list_move_tail(&dev->power.entry, &dpm_list);
} }
@ -393,7 +386,7 @@ static void pm_dev_err(struct device *dev, pm_message_t state, char *info,
int error) int error)
{ {
printk(KERN_ERR "PM: Device %s failed to %s%s: error %d\n", printk(KERN_ERR "PM: Device %s failed to %s%s: error %d\n",
kobject_name(&dev->kobj), pm_verb(state.event), info, error); dev_name(dev), pm_verb(state.event), info, error);
} }
static void dpm_show_time(ktime_t starttime, pm_message_t state, char *info) static void dpm_show_time(ktime_t starttime, pm_message_t state, char *info)
@ -1028,7 +1021,7 @@ static int dpm_prepare(pm_message_t state)
} }
printk(KERN_INFO "PM: Device %s not prepared " printk(KERN_INFO "PM: Device %s not prepared "
"for power transition: code %d\n", "for power transition: code %d\n",
kobject_name(&dev->kobj), error); dev_name(dev), error);
put_device(dev); put_device(dev);
break; break;
} }