From a191193b49271acd63311c55c7ff5213a90274ac Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Wed, 20 Oct 2010 06:51:35 +0000 Subject: [PATCH] --- yaml --- r: 227745 b: refs/heads/master c: 53ab0e6888925ae3ebe931c060120b0f11c1923c h: refs/heads/master i: 227743: de0353f1cb00b9d9e9eb2956cccd00824a1f2850 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/hp_accel.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9ca5f314c56e..c198bfa31151 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22d3b41281b4c1a55086fa4dff7abb4f0c36403e +refs/heads/master: 53ab0e6888925ae3ebe931c060120b0f11c1923c diff --git a/trunk/drivers/hwmon/hp_accel.c b/trunk/drivers/hwmon/hp_accel.c index a56a78412fcb..3d21fa2b97cd 100644 --- a/trunk/drivers/hwmon/hp_accel.c +++ b/trunk/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 #include #include @@ -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; }