From: Joe Perches <joe@perches.com>
To: Jean Delvare <khali@linux-fr.org>,
Guenter Roeck <guenter.roeck@ericsson.com>
Cc: lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org
Subject: [PATCH 15/32] drivers/hwmon/it87.c: Use pr_fmt and pr_<level>
Date: Tue, 19 Oct 2010 23:51:39 -0700 [thread overview]
Message-ID: <ca9c0c999e7108d20fab9d4be3b310736bbdd7a6.1287556801.git.joe@perches.com> (raw)
In-Reply-To: <20101020035346.GA20178@ericsson.com>
In-Reply-To: <cover.1287556800.git.joe@perches.com>
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>
---
drivers/hwmon/it87.c | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index f770129..3d3da59 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -36,6 +36,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
@@ -1493,26 +1495,25 @@ static int __init it87_find(unsigned short *address,
case 0xffff: /* No device at all */
goto exit;
default:
- pr_debug(DRVNAME ": Unsupported chip (DEVID=0x%x)\n",
- chip_type);
+ pr_debug("Unsupported chip (DEVID=0x%x)\n", chip_type);
goto exit;
}
superio_select(PME);
if (!(superio_inb(IT87_ACT_REG) & 0x01)) {
- pr_info("it87: Device not activated, skipping\n");
+ pr_info("Device not activated, skipping\n");
goto exit;
}
*address = superio_inw(IT87_BASE_REG) & ~(IT87_EXTENT - 1);
if (*address == 0) {
- pr_info("it87: Base address not set, skipping\n");
+ pr_info("Base address not set, skipping\n");
goto exit;
}
err = 0;
sio_data->revision = superio_inb(DEVREV) & 0x0f;
- pr_info("it87: Found IT%04xF chip at 0x%x, revision %d\n",
+ pr_info("Found IT%04xF chip at 0x%x, revision %d\n",
chip_type, *address, sio_data->revision);
/* in8 (Vbat) is always internal */
@@ -1533,7 +1534,7 @@ static int __init it87_find(unsigned short *address,
/* We need at least 4 VID pins */
reg = superio_inb(IT87_SIO_GPIO3_REG);
if (reg & 0x0f) {
- pr_info("it87: VID is disabled (pins used for GPIO)\n");
+ pr_info("VID is disabled (pins used for GPIO)\n");
sio_data->skip_vid = 1;
}
@@ -1568,7 +1569,7 @@ static int __init it87_find(unsigned short *address,
if (sio_data->type == it8720 && !(reg & (1 << 1))) {
reg |= (1 << 1);
superio_outb(IT87_SIO_PINX2_REG, reg);
- pr_notice("it87: Routing internal VCCH to in7\n");
+ pr_notice("Routing internal VCCH to in7\n");
}
if (reg & (1 << 0))
sio_data->internal |= (1 << 0);
@@ -1578,7 +1579,7 @@ static int __init it87_find(unsigned short *address,
sio_data->beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) & 0x3f;
}
if (sio_data->beep_pin)
- pr_info("it87: Beeping is supported\n");
+ pr_info("Beeping is supported\n");
/* Disable specific features based on DMI strings */
board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
@@ -1592,8 +1593,7 @@ static int __init it87_find(unsigned short *address,
the PWM2 duty cycle, so we disable it.
I use the board name string as the trigger in case
the same board is ever used in other systems. */
- pr_info("it87: Disabling pwm2 due to "
- "hardware constraints\n");
+ pr_info("Disabling pwm2 due to hardware constraints\n");
sio_data->skip_pwm = (1 << 1);
}
}
@@ -2086,28 +2086,26 @@ static int __init it87_device_add(unsigned short address,
pdev = platform_device_alloc(DRVNAME, address);
if (!pdev) {
err = -ENOMEM;
- printk(KERN_ERR DRVNAME ": Device allocation failed\n");
+ pr_err("Device allocation failed\n");
goto exit;
}
err = platform_device_add_resources(pdev, &res, 1);
if (err) {
- printk(KERN_ERR DRVNAME ": Device resource addition failed "
- "(%d)\n", err);
+ pr_err("Device resource addition failed (%d)\n", err);
goto exit_device_put;
}
err = platform_device_add_data(pdev, sio_data,
sizeof(struct it87_sio_data));
if (err) {
- printk(KERN_ERR DRVNAME ": Platform data allocation failed\n");
+ pr_err("Platform data allocation failed\n");
goto exit_device_put;
}
err = platform_device_add(pdev);
if (err) {
- printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
- err);
+ pr_err("Device addition failed (%d)\n", err);
goto exit_device_put;
}
--
1.7.3.1.g432b3.dirty
next prev parent reply other threads:[~2010-10-20 6:56 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-19 23:13 [PATCH] drivers/hwmon: " Joe Perches
2010-10-20 3:29 ` Guenter Roeck
2010-10-20 3:34 ` Joe Perches
2010-10-20 3:53 ` Guenter Roeck
2010-10-20 4:07 ` Joe Perches
2010-10-20 6:04 ` Henrik Rydberg
2010-10-20 7:34 ` Jean Delvare
2010-10-20 14:46 ` Guenter Roeck
2010-10-20 16:08 ` Joe Perches
2010-10-20 16:45 ` Jean Delvare
2010-10-20 16:38 ` Jean Delvare
2010-10-20 16:43 ` Guenter Roeck
2010-10-20 16:46 ` Jean Delvare
2010-10-20 18:03 ` Guenter Roeck
2010-10-20 16:27 ` Joe Perches
2010-10-20 16:42 ` Jean Delvare
2010-10-20 6:51 ` [PATCH 00/32] " Joe Perches
2010-10-20 6:51 ` [PATCH 01/32] drivers/hwmon/abituguru.c: " Joe Perches
2010-11-09 16:25 ` [01/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 02/32] drivers/hwmon/abituguru3.c: " Joe Perches
2010-11-09 16:28 ` [02/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 03/32] drivers/hwmon/adt7470.c: " Joe Perches
2010-11-09 16:29 ` [03/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 04/32] drivers/hwmon/applesmc.c: " Joe Perches
2010-10-20 9:54 ` Henrik Rydberg
2010-11-09 16:35 ` [04/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 05/32] drivers/hwmon/asb100.c: " Joe Perches
2010-11-09 16:35 ` [05/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 06/32] drivers/hwmon/asus_atk0110.c: " Joe Perches
2010-11-09 16:37 ` [06/32] " Guenter Roeck
2010-11-09 20:15 ` Luca Tettamanti
2010-11-09 20:34 ` Guenter Roeck
2010-10-20 6:51 ` [PATCH 07/32] drivers/hwmon/coretemp.c: " Joe Perches
2010-11-09 16:38 ` [07/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 08/32] drivers/hwmon/dme1737.c: " Joe Perches
2010-11-09 16:39 ` [08/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 09/32] drivers/hwmon/f71805f.c: " Joe Perches
2010-11-09 16:40 ` [09/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 10/32] drivers/hwmon/f71882fg.c: " Joe Perches
2010-11-09 16:41 ` [10/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 11/32] drivers/hwmon/hp_accel.c: " Joe Perches
2010-11-09 16:42 ` [11/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 12/32] drivers/hwmon/hwmon-vid.c: " Joe Perches
2010-11-09 16:43 ` [12/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 13/32] drivers/hwmon/hwmon.c: " Joe Perches
2010-11-09 16:44 ` [13/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 14/32] drivers/hwmon/ibmaem.c: " Joe Perches
2010-11-09 16:44 ` [14/32] " Guenter Roeck
2010-10-20 6:51 ` Joe Perches [this message]
2010-11-09 9:21 ` [PATCH 15/32] drivers/hwmon/it87.c: " Jean Delvare
2010-10-20 6:51 ` [PATCH 16/32] drivers/hwmon/lis3lv02d.c: " Joe Perches
2010-11-09 16:46 ` [16/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 17/32] drivers/hwmon/lm70.c: " Joe Perches
2010-11-09 16:47 ` [17/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 18/32] drivers/hwmon/lm78.c: " Joe Perches
2010-11-09 9:25 ` Jean Delvare
2010-10-20 6:51 ` [PATCH 19/32] drivers/hwmon/pc87360.c: " Joe Perches
2010-11-09 9:31 ` Jean Delvare
2010-11-09 9:59 ` Joe Perches
2010-11-09 12:08 ` Jean Delvare
2010-10-20 6:51 ` [PATCH 20/32] drivers/hwmon/pc87427.c: " Joe Perches
2010-11-09 9:35 ` Jean Delvare
2010-10-20 6:51 ` [PATCH 21/32] drivers/hwmon/pcf8591.c: " Joe Perches
2010-11-09 16:49 ` [21/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 22/32] drivers/hwmon/pkgtemp.c: " Joe Perches
2010-11-09 16:50 ` [22/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 23/32] drivers/hwmon/sis5595.c: " Joe Perches
2010-11-09 16:51 ` [23/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 24/32] drivers/hwmon/smsc47b397.c: " Joe Perches
2010-11-09 16:51 ` [24/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 25/32] drivers/hwmon/smsc47m1.c: " Joe Perches
2010-11-09 16:52 ` [25/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 26/32] drivers/hwmon/via-cputemp.c: " Joe Perches
2010-11-09 16:53 ` [26/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 27/32] drivers/hwmon/via686a.c: " Joe Perches
2010-11-09 16:54 ` [27/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 28/32] drivers/hwmon/vt1211.c: " Joe Perches
2010-11-09 16:57 ` [28/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 29/32] drivers/hwmon/vt8231.c: " Joe Perches
2010-11-09 16:58 ` [29/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 30/32] drivers/hwmon/w83627ehf.c: " Joe Perches
2010-11-09 16:59 ` [30/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 31/32] drivers/hwmon/w83627hf.c: " Joe Perches
2010-11-09 17:00 ` [31/32] " Guenter Roeck
2010-10-20 6:51 ` [PATCH 32/32] drivers/hwmon/w83781d.c: " Joe Perches
2010-11-09 9:39 ` Jean Delvare
2010-11-09 10:04 ` Joe Perches
2010-10-20 7:42 ` [PATCH] drivers/hwmon: " Jean Delvare
2010-10-20 15:59 ` Joe Perches
2010-10-20 16:49 ` Guenter Roeck
2010-10-20 16:54 ` Joe Perches
2010-10-20 17:18 ` Guenter Roeck
2010-10-20 17:28 ` Joe Perches
2010-10-20 17:48 ` Guenter Roeck
2010-10-20 18:02 ` Joe Perches
2010-10-20 18:35 ` Guenter Roeck
2010-10-20 19:08 ` Joe Perches
2010-10-20 19:57 ` Jean Delvare
2010-10-20 19:19 ` Davidlohr Bueso
2010-10-20 19:38 ` Jean Delvare
2010-10-20 19:52 ` Joe Perches
2010-10-20 19:59 ` Joe Perches
2010-10-20 20:36 ` Jim Cromie
2010-10-20 20:13 ` Jean Delvare
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ca9c0c999e7108d20fab9d4be3b310736bbdd7a6.1287556801.git.joe@perches.com \
--to=joe@perches.com \
--cc=guenter.roeck@ericsson.com \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lm-sensors@lm-sensors.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®