Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / hwmon / hwmon.c

diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index 29ea6753f3bbe54592168dcaa1db07b1a2dbab3d..a61e7815a2a9153f7ad82e8dc2ff49273763c19a 100644 (file)
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -10,6 +10,8 @@
     the Free Software Foundation; version 2 of the License.
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/err.h>
@@ -119,7 +121,7 @@ static int __init hwmon_init(void)
 
        hwmon_class = class_create(THIS_MODULE, "hwmon");
        if (IS_ERR(hwmon_class)) {
-               printk(KERN_ERR "hwmon.c: couldn't create sysfs class\n");
+               pr_err("couldn't create sysfs class\n");
                return PTR_ERR(hwmon_class);
        }
        return 0;