Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c1a07ab authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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



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

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent b64959e6

drivers/base/power/main.c

+9 −16
Original line number Diff line number Diff line
@@ -88,8 +88,7 @@ void device_pm_unlock(void) 
void device_pm_add(struct device *dev)

{

	pr_debug("PM: Adding info for %s:%s\n",

		 dev->bus ? dev->bus->name : "No Bus",

		 kobject_name(&dev->kobj));

		 dev->bus ? dev->bus->name : "No Bus", dev_name(dev));

	mutex_lock(&dpm_list_mtx);

	if (dev->parent && dev->parent->power.in_suspend)

		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)

{

	pr_debug("PM: Removing info for %s:%s\n",

		 dev->bus ? dev->bus->name : "No Bus",

		 kobject_name(&dev->kobj));

		 dev->bus ? dev->bus->name : "No Bus", dev_name(dev));

	complete_all(&dev->power.completion);

	mutex_lock(&dpm_list_mtx);

	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)

{

	pr_debug("PM: Moving %s:%s before %s:%s\n",

		 deva->bus ? deva->bus->name : "No Bus",

		 kobject_name(&deva->kobj),

		 devb->bus ? devb->bus->name : "No Bus",

		 kobject_name(&devb->kobj));

		 deva->bus ? deva->bus->name : "No Bus", dev_name(deva),

		 devb->bus ? devb->bus->name : "No Bus", dev_name(devb));

	/* Delete deva from dpm_list and reinsert before devb. */

	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)

{

	pr_debug("PM: Moving %s:%s after %s:%s\n",

		 deva->bus ? deva->bus->name : "No Bus",

		 kobject_name(&deva->kobj),

		 devb->bus ? devb->bus->name : "No Bus",

		 kobject_name(&devb->kobj));

		 deva->bus ? deva->bus->name : "No Bus", dev_name(deva),

		 devb->bus ? devb->bus->name : "No Bus", dev_name(devb));

	/* Delete deva from dpm_list and reinsert after devb. */

	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)

{

	pr_debug("PM: Moving %s:%s to end of list\n",

		 dev->bus ? dev->bus->name : "No Bus",

		 kobject_name(&dev->kobj));

		 dev->bus ? dev->bus->name : "No Bus", dev_name(dev));

	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)

{

	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)
@@ -1028,7 +1021,7 @@ static int dpm_prepare(pm_message_t state) 
			}

			printk(KERN_INFO "PM: Device %s not prepared "

				"for power transition: code %d\n",

				kobject_name(&dev->kobj), error);

				dev_name(dev), error);

			put_device(dev);

			break;

		}