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

Commit 465d2b47 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown
Browse files

Suspend: Use common prefix in messages 



Make suspend messages start with one common prefix "PM: ".

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent b6887a29

kernel/power/main.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -235,7 +235,7 @@ static int suspend_enter(suspend_state_t state) 
	BUG_ON(!irqs_disabled());

	BUG_ON(!irqs_disabled());





	if ((error = device_power_down(PMSG_SUSPEND))) {

	if ((error = device_power_down(PMSG_SUSPEND))) {

		printk(KERN_ERR "Some devices failed to power down\n");

		printk(KERN_ERR "PM: Some devices failed to power down\n");

		goto Done;

		goto Done;

	}

	}
@@ -269,7 +269,7 @@ int suspend_devices_and_enter(suspend_state_t state) 
	suspend_console();

	suspend_console();

	error = device_suspend(PMSG_SUSPEND);

	error = device_suspend(PMSG_SUSPEND);

	if (error) {

	if (error) {

		printk(KERN_ERR "Some devices failed to suspend\n");

		printk(KERN_ERR "PM: Some devices failed to suspend\n");

		goto Resume_console;

		goto Resume_console;

	}

	}
@@ -352,7 +352,7 @@ static int enter_state(suspend_state_t state) 
	if (!mutex_trylock(&pm_mutex))

	if (!mutex_trylock(&pm_mutex))

		return -EBUSY;

		return -EBUSY;





	printk("Syncing filesystems ... ");

	printk(KERN_INFO "PM: Syncing filesystems ... ");

	sys_sync();

	sys_sync();

	printk("done.\n");

	printk("done.\n");