aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/asb100.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-10-20 02:51:29 -0400
committerGuenter Roeck <guenter.roeck@ericsson.com>2011-01-08 13:55:03 -0500
commit4d630e2ba59a231c8e5031cc55e16737aa59af97 (patch)
treefc7db44d53ad58ec4aa15693304f907d8b9be45c /drivers/hwmon/asb100.c
parent2e991201e4ebffb1fb32873d72e2ee4b499269c3 (diff)
hwmon: (asb1000) 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/asb100.c')
-rw-r--r--drivers/hwmon/asb100.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 7dada559b3a1..c02a052d3085 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -36,6 +36,8 @@
36 asb100 7 3 1 4 0x31 0x0694 yes no 36 asb100 7 3 1 4 0x31 0x0694 yes no
37*/ 37*/
38 38
39#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
40
39#include <linux/module.h> 41#include <linux/module.h>
40#include <linux/slab.h> 42#include <linux/slab.h>
41#include <linux/i2c.h> 43#include <linux/i2c.h>
@@ -701,8 +703,7 @@ static int asb100_detect(struct i2c_client *client,
701 int val1, val2; 703 int val1, val2;
702 704
703 if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { 705 if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
704 pr_debug("asb100.o: detect failed, " 706 pr_debug("detect failed, smbus byte data not supported!\n");
705 "smbus byte data not supported!\n");
706 return -ENODEV; 707 return -ENODEV;
707 } 708 }
708 709
@@ -715,7 +716,7 @@ static int asb100_detect(struct i2c_client *client,
715 (((!(val1 & 0x80)) && (val2 != 0x94)) || 716 (((!(val1 & 0x80)) && (val2 != 0x94)) ||
716 /* Check for ASB100 ID (high byte ) */ 717 /* Check for ASB100 ID (high byte ) */
717 ((val1 & 0x80) && (val2 != 0x06)))) { 718 ((val1 & 0x80) && (val2 != 0x06)))) {
718 pr_debug("asb100: detect failed, bad chip id 0x%02x!\n", val2); 719 pr_debug("detect failed, bad chip id 0x%02x!\n", val2);
719 return -ENODEV; 720 return -ENODEV;
720 } 721 }
721 722
@@ -744,7 +745,7 @@ static int asb100_probe(struct i2c_client *client,
744 745
745 data = kzalloc(sizeof(struct asb100_data), GFP_KERNEL); 746 data = kzalloc(sizeof(struct asb100_data), GFP_KERNEL);
746 if (!data) { 747 if (!data) {
747 pr_debug("asb100.o: probe failed, kzalloc failed!\n"); 748 pr_debug("probe failed, kzalloc failed!\n");
748 err = -ENOMEM; 749 err = -ENOMEM;
749 goto ERROR0; 750 goto ERROR0;
750 } 751 }