aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/hp_accel.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-10-20 02:51:35 -0400
committerGuenter Roeck <guenter.roeck@ericsson.com>2011-01-08 13:55:09 -0500
commit53ab0e6888925ae3ebe931c060120b0f11c1923c (patch)
tree3e82e6f1091285bc11bbdb33a945f3debb86663a /drivers/hwmon/hp_accel.c
parent22d3b41281b4c1a55086fa4dff7abb4f0c36403e (diff)
hwmon: (hp_accel) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_<level> Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Diffstat (limited to 'drivers/hwmon/hp_accel.c')
-rw-r--r--drivers/hwmon/hp_accel.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/hwmon/hp_accel.c b/drivers/hwmon/hp_accel.c
index a56a78412fcb..3d21fa2b97cd 100644
--- a/drivers/hwmon/hp_accel.c
+++ b/drivers/hwmon/hp_accel.c
@@ -20,6 +20,8 @@
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21 */ 21 */
22 22
23#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
24
23#include <linux/kernel.h> 25#include <linux/kernel.h>
24#include <linux/init.h> 26#include <linux/init.h>
25#include <linux/dmi.h> 27#include <linux/dmi.h>
@@ -147,7 +149,7 @@ int lis3lv02d_acpi_write(struct lis3lv02d *lis3, int reg, u8 val)
147static int lis3lv02d_dmi_matched(const struct dmi_system_id *dmi) 149static int lis3lv02d_dmi_matched(const struct dmi_system_id *dmi)
148{ 150{
149 lis3_dev.ac = *((union axis_conversion *)dmi->driver_data); 151 lis3_dev.ac = *((union axis_conversion *)dmi->driver_data);
150 printk(KERN_INFO DRIVER_NAME ": hardware type %s found.\n", dmi->ident); 152 pr_info("hardware type %s found\n", dmi->ident);
151 153
152 return 1; 154 return 1;
153} 155}
@@ -303,11 +305,10 @@ static int lis3lv02d_add(struct acpi_device *device)
303 305
304 /* If possible use a "standard" axes order */ 306 /* If possible use a "standard" axes order */
305 if (lis3_dev.ac.x && lis3_dev.ac.y && lis3_dev.ac.z) { 307 if (lis3_dev.ac.x && lis3_dev.ac.y && lis3_dev.ac.z) {
306 printk(KERN_INFO DRIVER_NAME ": Using custom axes %d,%d,%d\n", 308 pr_info("Using custom axes %d,%d,%d\n",
307 lis3_dev.ac.x, lis3_dev.ac.y, lis3_dev.ac.z); 309 lis3_dev.ac.x, lis3_dev.ac.y, lis3_dev.ac.z);
308 } else if (dmi_check_system(lis3lv02d_dmi_ids) == 0) { 310 } else if (dmi_check_system(lis3lv02d_dmi_ids) == 0) {
309 printk(KERN_INFO DRIVER_NAME ": laptop model unknown, " 311 pr_info("laptop model unknown, using default axes configuration\n");
310 "using default axes configuration\n");
311 lis3_dev.ac = lis3lv02d_axis_normal; 312 lis3_dev.ac = lis3lv02d_axis_normal;
312 } 313 }
313 314
@@ -385,7 +386,7 @@ static int __init lis3lv02d_init_module(void)
385 if (ret < 0) 386 if (ret < 0)
386 return ret; 387 return ret;
387 388
388 printk(KERN_INFO DRIVER_NAME " driver loaded.\n"); 389 pr_info("driver loaded\n");
389 390
390 return 0; 391 return 0;
391} 392}