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

Commit c5a01dd5 authored by Joe Perches's avatar Joe Perches Committed by Len Brown
Browse files

thermal_sys: convert printks to pr_<level> 



Use the current logging style.

Remove PREFIX, add pr_fmt, convert the printks.  All dmesg output now
prefixed with "thermal_sys: ".

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Jesper Juhl <jj@chaosbits.net>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent caca8b80

drivers/thermal/thermal_sys.c

+6 −8
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/device.h>

#include <linux/err.h>
@@ -39,8 +41,6 @@ MODULE_AUTHOR("Zhang Rui"); 
MODULE_DESCRIPTION("Generic thermal management sysfs support");

MODULE_LICENSE("GPL");



#define PREFIX "Thermal: "



struct thermal_cooling_device_instance {

	int id;

	char name[THERMAL_NAME_LENGTH];
@@ -1023,8 +1023,7 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) 


	if (tz->ops->get_temp(tz, &temp)) {

		/* get_temp failed - retry it later */

		printk(KERN_WARNING PREFIX "failed to read out thermal zone "

		       "%d\n", tz->id);

		pr_warn("failed to read out thermal zone %d\n", tz->id);

		goto leave;

	}
@@ -1039,8 +1038,7 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) 
					ret = tz->ops->notify(tz, count,

							      trip_type);

				if (!ret) {

					printk(KERN_EMERG

					       "Critical temperature reached (%ld C), shutting down.\n",

					pr_emerg("Critical temperature reached (%ld C), shutting down\n",

						 temp/1000);

					orderly_poweroff(true);

				}
@@ -1345,7 +1343,7 @@ int thermal_generate_netlink_event(u32 orig, enum events event) 


	result = genlmsg_multicast(skb, 0, thermal_event_mcgrp.id, GFP_ATOMIC);

	if (result)

		printk(KERN_INFO "failed to send netlink event:%d", result);

		pr_info("failed to send netlink event:%d\n", result);



	return result;

}