diff options
author | Joe Perches <joe@perches.com> | 2011-01-12 15:55:10 -0500 |
---|---|---|
committer | Jean Delvare <khali@endymion.delvare> | 2011-01-12 15:55:10 -0500 |
commit | ce47da742ddd950197c29df6f9f89cf8adb5a0a1 (patch) | |
tree | b10ea8c06b13a7bf1a9595b37e5f9dbfa7e7a682 /drivers/hwmon | |
parent | a8ca103793350bd66280d56ee58870c682b54e75 (diff) |
hwmon: (lm78) 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: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/lm78.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index 72ff2c4e757d..4cb24eafe318 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c | |||
@@ -19,6 +19,8 @@ | |||
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
23 | |||
22 | #include <linux/module.h> | 24 | #include <linux/module.h> |
23 | #include <linux/init.h> | 25 | #include <linux/init.h> |
24 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
@@ -858,7 +860,7 @@ static int __init lm78_isa_found(unsigned short address) | |||
858 | * individually for the probing phase. */ | 860 | * individually for the probing phase. */ |
859 | for (port = address; port < address + LM78_EXTENT; port++) { | 861 | for (port = address; port < address + LM78_EXTENT; port++) { |
860 | if (!request_region(port, 1, "lm78")) { | 862 | if (!request_region(port, 1, "lm78")) { |
861 | pr_debug("lm78: Failed to request port 0x%x\n", port); | 863 | pr_debug("Failed to request port 0x%x\n", port); |
862 | goto release; | 864 | goto release; |
863 | } | 865 | } |
864 | } | 866 | } |
@@ -920,7 +922,7 @@ static int __init lm78_isa_found(unsigned short address) | |||
920 | found = 1; | 922 | found = 1; |
921 | 923 | ||
922 | if (found) | 924 | if (found) |
923 | pr_info("lm78: Found an %s chip at %#x\n", | 925 | pr_info("Found an %s chip at %#x\n", |
924 | val & 0x80 ? "LM79" : "LM78", (int)address); | 926 | val & 0x80 ? "LM79" : "LM78", (int)address); |
925 | 927 | ||
926 | release: | 928 | release: |
@@ -942,21 +944,19 @@ static int __init lm78_isa_device_add(unsigned short address) | |||
942 | pdev = platform_device_alloc("lm78", address); | 944 | pdev = platform_device_alloc("lm78", address); |
943 | if (!pdev) { | 945 | if (!pdev) { |
944 | err = -ENOMEM; | 946 | err = -ENOMEM; |
945 | printk(KERN_ERR "lm78: Device allocation failed\n"); | 947 | pr_err("Device allocation failed\n"); |
946 | goto exit; | 948 | goto exit; |
947 | } | 949 | } |
948 | 950 | ||
949 | err = platform_device_add_resources(pdev, &res, 1); | 951 | err = platform_device_add_resources(pdev, &res, 1); |
950 | if (err) { | 952 | if (err) { |
951 | printk(KERN_ERR "lm78: Device resource addition failed " | 953 | pr_err("Device resource addition failed (%d)\n", err); |
952 | "(%d)\n", err); | ||
953 | goto exit_device_put; | 954 | goto exit_device_put; |
954 | } | 955 | } |
955 | 956 | ||
956 | err = platform_device_add(pdev); | 957 | err = platform_device_add(pdev); |
957 | if (err) { | 958 | if (err) { |
958 | printk(KERN_ERR "lm78: Device addition failed (%d)\n", | 959 | pr_err("Device addition failed (%d)\n", err); |
959 | err); | ||
960 | goto exit_device_put; | 960 | goto exit_device_put; |
961 | } | 961 | } |
962 | 962 | ||