From: Toshiaki Yamane <yamanetoshi@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Martyn Welch <martyn.welch@ge.com>,
Manohar Vanga <manohar.vanga@gmail.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Cc: Toshiaki Yamane <yamanetoshi@gmail.com>
Subject: [PATCH 5/5] staging/vme: fix checkpatch warning
Date: Fri, 17 Aug 2012 14:06:13 +0900 [thread overview]
Message-ID: <1345179973-8410-1-git-send-email-yamanetoshi@gmail.com> (raw)
In-Reply-To: <1345179867-8266-1-git-send-email-yamanetoshi@gmail.com>
The below checkpatch warnings was fixed,
-WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
and added pr_fmt.
Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com>
---
drivers/staging/vme/devices/vme_pio2_core.c | 10 +++++-----
drivers/staging/vme/devices/vme_user.c | 14 ++++++--------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c
index 4bf8e05..dad8281 100644
--- a/drivers/staging/vme/devices/vme_pio2_core.c
+++ b/drivers/staging/vme/devices/vme_pio2_core.c
@@ -10,6 +10,8 @@
* option) any later version.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/types.h>
@@ -163,15 +165,13 @@ static int __init pio2_init(void)
int retval = 0;
if (bus_num == 0) {
- printk(KERN_ERR "%s: No cards, skipping registration\n",
- driver_name);
+ pr_err("No cards, skipping registration\n");
goto err_nocard;
}
if (bus_num > PIO2_CARDS_MAX) {
- printk(KERN_ERR
- "%s: Driver only able to handle %d PIO2 Cards\n",
- driver_name, PIO2_CARDS_MAX);
+ pr_err("Driver only able to handle %d PIO2 Cards\n",
+ PIO2_CARDS_MAX);
bus_num = PIO2_CARDS_MAX;
}
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index e47fc41..7d28086 100644
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -172,7 +172,7 @@ static int vme_user_open(struct inode *inode, struct file *file)
mutex_lock(&image[minor].mutex);
/* Allow device to be opened if a resource is needed and allocated. */
if (minor < CONTROL_MINOR && image[minor].resource == NULL) {
- printk(KERN_ERR "No resources allocated for device\n");
+ pr_err("No resources allocated for device\n");
err = -EINVAL;
goto err_res;
}
@@ -630,8 +630,7 @@ static int __init vme_user_init(void)
pr_info("VME User Space Access Driver\n");
if (bus_num == 0) {
- printk(KERN_ERR "%s: No cards, skipping registration\n",
- driver_name);
+ pr_err("No cards, skipping registration\n");
retval = -ENODEV;
goto err_nocard;
}
@@ -640,8 +639,8 @@ static int __init vme_user_init(void)
* in future revisions if that ever becomes necessary.
*/
if (bus_num > VME_USER_BUS_MAX) {
- printk(KERN_ERR "%s: Driver only able to handle %d buses\n",
- driver_name, VME_USER_BUS_MAX);
+ pr_err("Driver only able to handle %d buses\n",
+ VME_USER_BUS_MAX);
bus_num = VME_USER_BUS_MAX;
}
@@ -681,8 +680,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)
/* Save pointer to the bridge device */
if (vme_user_bridge != NULL) {
- printk(KERN_ERR "%s: Driver can only be loaded for 1 device\n",
- driver_name);
+ pr_err("Driver can only be loaded for 1 device\n");
err = -EINVAL;
goto err_dev;
}
@@ -769,7 +767,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)
/* Create sysfs entries - on udev systems this creates the dev files */
vme_user_sysfs_class = class_create(THIS_MODULE, driver_name);
if (IS_ERR(vme_user_sysfs_class)) {
- printk(KERN_ERR "Error creating vme_user class.\n");
+ pr_err("Error creating vme_user class.\n");
err = PTR_ERR(vme_user_sysfs_class);
goto err_class;
}
--
1.7.9.5
prev parent reply other threads:[~2012-08-17 5:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-21 13:00 [PATCH] staging/vme: fix checkpatch warnings Toshiaki Yamane
2012-07-23 0:53 ` Toshiaki Yamane
2012-08-17 5:04 ` [PATCH 1/5] staging/vme: fix checkpatch error Toshiaki Yamane
2012-08-17 5:05 ` [PATCH 2/5] staging/vme: fix checkpatch warning Toshiaki Yamane
2012-08-17 7:46 ` Dan Carpenter
2012-08-17 8:27 ` Toshiaki Yamane
2012-08-17 13:19 ` Greg Kroah-Hartman
2012-08-17 14:30 ` Toshiaki Yamane
2012-08-21 11:11 ` Toshiaki Yamane
2012-08-21 11:12 ` [PATCH 1/3] Staging: vme: Fix a white space issue Toshiaki Yamane
2012-08-21 11:12 ` [PATCH 2/3] staging/vme: Use pr_ printks in vme_user.c Toshiaki Yamane
2012-09-04 20:20 ` Greg Kroah-Hartman
2012-09-11 7:16 ` [PATCH 1/2] " Toshiaki Yamane
2012-09-11 7:17 ` [PATCH 2/2] staging/vme: Use dev_ " Toshiaki Yamane
2012-09-11 19:08 ` Greg Kroah-Hartman
2012-09-11 19:08 ` [PATCH 1/2] staging/vme: Use pr_ " Greg Kroah-Hartman
2012-09-12 7:36 ` Toshiaki Yamane
2012-09-12 14:04 ` Greg Kroah-Hartman
2012-08-21 11:13 ` [PATCH 3/3] staging/vme: Use pr_ printks in vme_pio2_core.c Toshiaki Yamane
2012-08-17 5:05 ` [PATCH 3/5] staging/vme: fix checkpatch warning Toshiaki Yamane
2012-08-17 5:05 ` [PATCH 4/5] " Toshiaki Yamane
2012-08-17 5:06 ` Toshiaki Yamane [this message]
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=1345179973-8410-1-git-send-email-yamanetoshi@gmail.com \
--to=yamanetoshi@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manohar.vanga@gmail.com \
--cc=martyn.welch@ge.com \
/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;
as well as URLs for NNTP newsgroup(s).