1 files changed, 22 insertions, 42 deletions

diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c
index 3cf28af614b5..d30855a75786 100644
--- a/drivers/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
@@ -1,7 +1,7 @@
 /*
     abituguru3.c
 
-    Copyright (c) 2006-2008 Hans de Goede <j.w.r.degoede@hhs.nl>
+    Copyright (c) 2006-2008 Hans de Goede <hdegoede@redhat.com>
     Copyright (c) 2008 Alistair John Strachan <alistair@devzero.co.uk>
 
     This program is free software; you can redistribute it and/or modify
@@ -23,6 +23,9 @@
     chip found on newer Abit uGuru motherboards. Note: because of lack of specs
     only reading the sensors and their settings is supported.
 */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -148,7 +151,7 @@ struct abituguru3_data {
         /* Pointer to the sensors info for the detected motherboard */
         const struct abituguru3_sensor_info *sensors;
 
-        /* The abituguru3 supports upto 48 sensors, and thus has registers
+        /* The abituguru3 supports up to 48 sensors, and thus has registers
            sets for 48 sensors, for convienence reasons / simplicity of the
            code we always read and store all registers for all 48 sensors */
 
@@ -608,6 +611,9 @@ static int verbose = 1;
 module_param(verbose, bool, 0644);
 MODULE_PARM_DESC(verbose, "Enable/disable verbose error reporting");
 
+static const char *never_happen = "This should never happen.";
+static const char *report_this =
+        "Please report this to the abituguru3 maintainer (see MAINTAINERS)";
 
 /* wait while the uguru is busy (usually after a write) */
 static int abituguru3_wait_while_busy(struct abituguru3_data *data)
@@ -940,15 +946,13 @@ static int __devinit abituguru3_probe(struct platform_device *pdev)
                 if (abituguru3_motherboards[i].id == id)
                         break;
         if (!abituguru3_motherboards[i].id) {
-                printk(KERN_ERR ABIT_UGURU3_NAME ": error unknown motherboard "
-                        "ID: %04X. Please report this to the abituguru3 "
-                        "maintainer (see MAINTAINERS)\n", (unsigned int)id);
+                pr_err("error unknown motherboard ID: %04X. %s\n",
+                       (unsigned int)id, report_this);
                 goto abituguru3_probe_error;
         }
         data->sensors = abituguru3_motherboards[i].sensors;
 
-        printk(KERN_INFO ABIT_UGURU3_NAME ": found Abit uGuru3, motherboard "
-                "ID: %04X\n", (unsigned int)id);
+        pr_info("found Abit uGuru3, motherboard ID: %04X\n", (unsigned int)id);
 
         /* Fill the sysfs attr array */
         sysfs_attr_i = 0;
@@ -957,11 +961,8 @@ static int __devinit abituguru3_probe(struct platform_device *pdev)
         for (i = 0; data->sensors[i].name; i++) {
                 /* Fail safe check, this should never happen! */
                 if (i >= ABIT_UGURU3_MAX_NO_SENSORS) {
-                        printk(KERN_ERR ABIT_UGURU3_NAME
-                                ": Fatal error motherboard has more sensors "
-                                "then ABIT_UGURU3_MAX_NO_SENSORS. This should "
-                                "never happen please report to the abituguru3 "
-                                "maintainer (see MAINTAINERS)\n");
+                        pr_err("Fatal error motherboard has more sensors then ABIT_UGURU3_MAX_NO_SENSORS. %s %s\n",
+                               never_happen, report_this);
                         res = -ENAMETOOLONG;
                         goto abituguru3_probe_error;
                 }
@@ -983,10 +984,8 @@ static int __devinit abituguru3_probe(struct platform_device *pdev)
         }
         /* Fail safe check, this should never happen! */
         if (sysfs_names_free < 0) {
-                printk(KERN_ERR ABIT_UGURU3_NAME
-                        ": Fatal error ran out of space for sysfs attr names. "
-                        "This should never happen please report to the "
-                        "abituguru3 maintainer (see MAINTAINERS)\n");
+                pr_err("Fatal error ran out of space for sysfs attr names. %s %s\n",
+                       never_happen, report_this);
                 res = -ENAMETOOLONG;
                 goto abituguru3_probe_error;
         }
@@ -1120,8 +1119,6 @@ static struct platform_driver abituguru3_driver = {
         .resume = abituguru3_resume
 };
 
-#ifdef CONFIG_DMI
-
 static int __init abituguru3_dmi_detect(void)
 {
         const char *board_vendor, *board_name;
@@ -1160,15 +1157,6 @@ static int __init abituguru3_dmi_detect(void)
         return 1;
 }
 
-#else /* !CONFIG_DMI */
-
-static inline int abituguru3_dmi_detect(void)
-{
-        return 1;
-}
-
-#endif /* CONFIG_DMI */
-
 /* FIXME: Manual detection should die eventually; we need to collect stable
  *        DMI model names first before we can rely entirely on CONFIG_DMI.
  */
@@ -1189,8 +1177,7 @@ static int __init abituguru3_detect(void)
                 "0x%02X\n", (unsigned int)data_val, (unsigned int)cmd_val);
 
         if (force) {
-                printk(KERN_INFO ABIT_UGURU3_NAME ": Assuming Abit uGuru3 is "
-                                "present because of \"force\" parameter\n");
+                pr_info("Assuming Abit uGuru3 is present because of \"force\" parameter\n");
                 return 0;
         }
 
@@ -1218,12 +1205,8 @@ static int __init abituguru3_init(void)
                 if (err)
                         return err;
 
-#ifdef CONFIG_DMI
-                printk(KERN_WARNING ABIT_UGURU3_NAME ": this motherboard was "
-                        "not detected using DMI. Please send the output of "
-                        "\"dmidecode\" to the abituguru3 maintainer "
-                        "(see MAINTAINERS)\n");
-#endif
+                pr_warn("this motherboard was not detected using DMI. "
+                        "Please send the output of \"dmidecode\" to the abituguru3 maintainer (see MAINTAINERS)\n");
         }
 
         err = platform_driver_register(&abituguru3_driver);
@@ -1233,8 +1216,7 @@ static int __init abituguru3_init(void)
         abituguru3_pdev = platform_device_alloc(ABIT_UGURU3_NAME,
                                                 ABIT_UGURU3_BASE);
         if (!abituguru3_pdev) {
-                printk(KERN_ERR ABIT_UGURU3_NAME
-                        ": Device allocation failed\n");
+                pr_err("Device allocation failed\n");
                 err = -ENOMEM;
                 goto exit_driver_unregister;
         }
@@ -1245,15 +1227,13 @@ static int __init abituguru3_init(void)
 
         err = platform_device_add_resources(abituguru3_pdev, &res, 1);
         if (err) {
-                printk(KERN_ERR ABIT_UGURU3_NAME
-                        ": Device resource addition failed (%d)\n", err);
+                pr_err("Device resource addition failed (%d)\n", err);
                 goto exit_device_put;
         }
 
         err = platform_device_add(abituguru3_pdev);
         if (err) {
-                printk(KERN_ERR ABIT_UGURU3_NAME
-                        ": Device addition failed (%d)\n", err);
+                pr_err("Device addition failed (%d)\n", err);
                 goto exit_device_put;
         }
 
@@ -1273,7 +1253,7 @@ static void __exit abituguru3_exit(void)
         platform_driver_unregister(&abituguru3_driver);
 }
 
-MODULE_AUTHOR("Hans de Goede <j.w.r.degoede@hhs.nl>");
+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
 MODULE_DESCRIPTION("Abit uGuru3 Sensor device");
 MODULE_LICENSE("GPL");