diff options
author | Joe Perches <joe@perches.com> | 2010-10-20 02:51:47 -0400 |
---|---|---|
committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2011-01-08 13:55:18 -0500 |
commit | 4b2515dbb94341db01db3208f9f40658c5e2a251 (patch) | |
tree | 3b05aae1367bd4d36949aef66a7a414d2b27dddb /drivers/hwmon | |
parent | 14a613cc23869d0ca69154bbc5816004fe201b17 (diff) |
hwmon: (sis5595) 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')
-rw-r--r-- | drivers/hwmon/sis5595.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c index 79c2931e3008..47d7ce9af8fb 100644 --- a/drivers/hwmon/sis5595.c +++ b/drivers/hwmon/sis5595.c | |||
@@ -50,6 +50,8 @@ | |||
50 | 735 0008 0735 | 50 | 735 0008 0735 |
51 | */ | 51 | */ |
52 | 52 | ||
53 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
54 | |||
53 | #include <linux/module.h> | 55 | #include <linux/module.h> |
54 | #include <linux/slab.h> | 56 | #include <linux/slab.h> |
55 | #include <linux/ioport.h> | 57 | #include <linux/ioport.h> |
@@ -735,21 +737,19 @@ static int __devinit sis5595_device_add(unsigned short address) | |||
735 | pdev = platform_device_alloc("sis5595", address); | 737 | pdev = platform_device_alloc("sis5595", address); |
736 | if (!pdev) { | 738 | if (!pdev) { |
737 | err = -ENOMEM; | 739 | err = -ENOMEM; |
738 | printk(KERN_ERR "sis5595: Device allocation failed\n"); | 740 | pr_err("Device allocation failed\n"); |
739 | goto exit; | 741 | goto exit; |
740 | } | 742 | } |
741 | 743 | ||
742 | err = platform_device_add_resources(pdev, &res, 1); | 744 | err = platform_device_add_resources(pdev, &res, 1); |
743 | if (err) { | 745 | if (err) { |
744 | printk(KERN_ERR "sis5595: Device resource addition failed " | 746 | pr_err("Device resource addition failed (%d)\n", err); |
745 | "(%d)\n", err); | ||
746 | goto exit_device_put; | 747 | goto exit_device_put; |
747 | } | 748 | } |
748 | 749 | ||
749 | err = platform_device_add(pdev); | 750 | err = platform_device_add(pdev); |
750 | if (err) { | 751 | if (err) { |
751 | printk(KERN_ERR "sis5595: Device addition failed (%d)\n", | 752 | pr_err("Device addition failed (%d)\n", err); |
752 | err); | ||
753 | goto exit_device_put; | 753 | goto exit_device_put; |
754 | } | 754 | } |
755 | 755 | ||