Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index e6078c9f0e27..db3b2e8d2a67 100644
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -24,6 +24,8 @@
 /* Supports VIA VT8231 South Bridge embedded sensors
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -902,21 +904,19 @@ static int __devinit vt8231_device_add(unsigned short address)
         pdev = platform_device_alloc("vt8231", address);
         if (!pdev) {
                 err = -ENOMEM;
-                printk(KERN_ERR "vt8231: Device allocation failed\n");
+                pr_err("Device allocation failed\n");
                 goto exit;
         }
 
         err = platform_device_add_resources(pdev, &res, 1);
         if (err) {
-                printk(KERN_ERR "vt8231: Device resource addition failed "
-                       "(%d)\n", err);
+                pr_err("Device resource addition failed (%d)\n", err);
                 goto exit_device_put;
         }
 
         err = platform_device_add(pdev);
         if (err) {
-                printk(KERN_ERR "vt8231: Device addition failed (%d)\n",
-                       err);
+                pr_err("Device addition failed (%d)\n", err);
                 goto exit_device_put;
         }