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

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

diff --git a/drivers/hwmon/hp_accel.c b/drivers/hwmon/hp_accel.c
index a56a78412fcba4f9e8d42887cd40382d4418bd2d..3d21fa2b97cd1d922119b17ea6a4780e89fc8a63 100644 (file)
--- a/drivers/hwmon/hp_accel.c
+++ b/drivers/hwmon/hp_accel.c
@@ -20,6 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/dmi.h>
@@ -147,7 +149,7 @@ int lis3lv02d_acpi_write(struct lis3lv02d *lis3, int reg, u8 val)
 static int lis3lv02d_dmi_matched(const struct dmi_system_id *dmi)
 {
        lis3_dev.ac = *((union axis_conversion *)dmi->driver_data);
-       printk(KERN_INFO DRIVER_NAME ": hardware type %s found.\n", dmi->ident);
+       pr_info("hardware type %s found\n", dmi->ident);
 
        return 1;
 }
@@ -303,11 +305,10 @@ static int lis3lv02d_add(struct acpi_device *device)
 
        /* If possible use a "standard" axes order */
        if (lis3_dev.ac.x && lis3_dev.ac.y && lis3_dev.ac.z) {
-               printk(KERN_INFO DRIVER_NAME ": Using custom axes %d,%d,%d\n",
-                      lis3_dev.ac.x, lis3_dev.ac.y, lis3_dev.ac.z);
+               pr_info("Using custom axes %d,%d,%d\n",
+                       lis3_dev.ac.x, lis3_dev.ac.y, lis3_dev.ac.z);
        } else if (dmi_check_system(lis3lv02d_dmi_ids) == 0) {
-               printk(KERN_INFO DRIVER_NAME ": laptop model unknown, "
-                                "using default axes configuration\n");
+               pr_info("laptop model unknown, using default axes configuration\n");
                lis3_dev.ac = lis3lv02d_axis_normal;
        }
 
@@ -385,7 +386,7 @@ static int __init lis3lv02d_init_module(void)
        if (ret < 0)
                return ret;
 
-       printk(KERN_INFO DRIVER_NAME " driver loaded.\n");
+       pr_info("driver loaded\n");
 
        return 0;
 }