Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 72ff2c4e757d5255fd4c90daf72ec6f39c39745b..4cb24eafe31819bdc7932c8894463428e545edf9 100644 (file)
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -19,6 +19,8 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -858,7 +860,7 @@ static int __init lm78_isa_found(unsigned short address)
         * individually for the probing phase. */
        for (port = address; port < address + LM78_EXTENT; port++) {
                if (!request_region(port, 1, "lm78")) {
-                       pr_debug("lm78: Failed to request port 0x%x\n", port);
+                       pr_debug("Failed to request port 0x%x\n", port);
                        goto release;
                }
        }
@@ -920,7 +922,7 @@ static int __init lm78_isa_found(unsigned short address)
                found = 1;
 
        if (found)
-               pr_info("lm78: Found an %s chip at %#x\n",
+               pr_info("Found an %s chip at %#x\n",
                        val & 0x80 ? "LM79" : "LM78", (int)address);
 
  release:
@@ -942,21 +944,19 @@ static int __init lm78_isa_device_add(unsigned short address)
        pdev = platform_device_alloc("lm78", address);
        if (!pdev) {
                err = -ENOMEM;
-               printk(KERN_ERR "lm78: 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 "lm78: 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 "lm78: Device addition failed (%d)\n",
-                      err);
+               pr_err("Device addition failed (%d)\n", err);
                goto exit_device_put;
        }