From: Sylwester Nawrocki <snjw23@gmail.com>
To: linux-media@vger.kernel.org
Cc: Piotr Chmura <chmooreck@poczta.onet.pl>,
Devin Heitmueller <dheitmueller@kernellabs.com>,
Mauro Carvalho Chehab <mchehab@redhat.com>,
Sylwester Nawrocki <snjw23@gmail.com>
Subject: [PATCH 08/13] staging: as102: Replace printk(KERN_<LEVEL> witk pr_<level>
Date: Sun, 6 Nov 2011 21:31:45 +0100 [thread overview]
Message-ID: <1320611510-3326-9-git-send-email-snjw23@gmail.com> (raw)
In-Reply-To: <1320611510-3326-1-git-send-email-snjw23@gmail.com>
While at it also correct some spelling errors.
Cc: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Sylwester Nawrocki <snjw23@gmail.com>
---
drivers/staging/media/as102/as102_fw.c | 26 +++++++++++++-------------
drivers/staging/media/as102/as102_usb_drv.c | 10 +++++-----
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/media/as102/as102_fw.c b/drivers/staging/media/as102/as102_fw.c
index ab7dcdb..fa56939 100644
--- a/drivers/staging/media/as102/as102_fw.c
+++ b/drivers/staging/media/as102/as102_fw.c
@@ -58,7 +58,7 @@ static int parse_hex_line(unsigned char *fw_data, unsigned char *addr,
unsigned char *src, dst;
if (*fw_data++ != ':') {
- printk(KERN_ERR "invalid firmware file\n");
+ pr_err("invalid firmware file\n");
return -EFAULT;
}
@@ -191,21 +191,21 @@ int as102_fw_upload(struct as102_bus_adapter_t *bus_adap)
/* request kernel to locate firmware file: part1 */
errno = request_firmware(&firmware, fw1, &dev->dev);
if (errno < 0) {
- printk(KERN_ERR "%s: unable to locate firmware file: %s\n",
- DRIVER_NAME, fw1);
+ pr_err("%s: unable to locate firmware file: %s\n",
+ DRIVER_NAME, fw1);
goto error;
}
/* initiate firmware upload */
errno = as102_firmware_upload(bus_adap, cmd_buf, firmware);
if (errno < 0) {
- printk(KERN_ERR "%s: error during firmware upload part1\n",
- DRIVER_NAME);
+ pr_err("%s: error during firmware upload part1\n",
+ DRIVER_NAME);
goto error;
}
- printk(KERN_INFO "%s: fimrware: %s loaded with success\n",
- DRIVER_NAME, fw1);
+ pr_info("%s: firmware: %s loaded with success\n",
+ DRIVER_NAME, fw1);
release_firmware(firmware);
/* wait for boot to complete */
@@ -214,21 +214,21 @@ int as102_fw_upload(struct as102_bus_adapter_t *bus_adap)
/* request kernel to locate firmware file: part2 */
errno = request_firmware(&firmware, fw2, &dev->dev);
if (errno < 0) {
- printk(KERN_ERR "%s: unable to locate firmware file: %s\n",
- DRIVER_NAME, fw2);
+ pr_err("%s: unable to locate firmware file: %s\n",
+ DRIVER_NAME, fw2);
goto error;
}
/* initiate firmware upload */
errno = as102_firmware_upload(bus_adap, cmd_buf, firmware);
if (errno < 0) {
- printk(KERN_ERR "%s: error during firmware upload part2\n",
- DRIVER_NAME);
+ pr_err("%s: error during firmware upload part2\n",
+ DRIVER_NAME);
goto error;
}
- printk(KERN_INFO "%s: fimrware: %s loaded with success\n",
- DRIVER_NAME, fw2);
+ pr_info("%s: firmware: %s loaded with success\n",
+ DRIVER_NAME, fw2);
error:
/* free data buffer */
kfree(cmd_buf);
diff --git a/drivers/staging/media/as102/as102_usb_drv.c b/drivers/staging/media/as102/as102_usb_drv.c
index e0c3854..3ded7d6 100644
--- a/drivers/staging/media/as102/as102_usb_drv.c
+++ b/drivers/staging/media/as102/as102_usb_drv.c
@@ -337,7 +337,7 @@ static void as102_usb_disconnect(struct usb_interface *intf)
/* decrement usage counter */
kref_put(&as102_dev->kref, as102_usb_release);
- printk(KERN_INFO "%s: device has been disconnected\n", DRIVER_NAME);
+ pr_info("%s: device has been disconnected\n", DRIVER_NAME);
LEAVE();
}
@@ -360,7 +360,7 @@ static int as102_usb_probe(struct usb_interface *intf,
/* This should never actually happen */
if ((sizeof(as102_usb_id_table) / sizeof(struct usb_device_id)) !=
(sizeof(as102_device_names) / sizeof(const char *))) {
- printk(KERN_ERR "Device names table invalid size");
+ pr_err("Device names table invalid size");
return -EINVAL;
}
@@ -399,7 +399,7 @@ static int as102_usb_probe(struct usb_interface *intf,
goto failed;
}
- printk(KERN_INFO "%s: device has been detected\n", DRIVER_NAME);
+ pr_info("%s: device has been detected\n", DRIVER_NAME);
/* request buffer allocation for streaming */
ret = as102_alloc_usb_stream_buffer(as102_dev);
@@ -432,8 +432,8 @@ static int as102_open(struct inode *inode, struct file *file)
/* fetch device from usb interface */
intf = usb_find_interface(&as102_usb_driver, minor);
if (intf == NULL) {
- printk(KERN_ERR "%s: can't find device for minor %d\n",
- __func__, minor);
+ pr_err("%s: can't find device for minor %d\n",
+ __func__, minor);
ret = -ENODEV;
goto exit;
}
--
1.7.5.4
next prev parent reply other threads:[~2011-11-06 20:32 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-06 20:31 [PATCH 00/13] Remaining coding style clean up of AS102 driver Sylwester Nawrocki
2011-11-06 20:31 ` [PATCH 01/13] staging: as102: Remove comment tags for editors configuration Sylwester Nawrocki
2011-11-06 20:31 ` [PATCH 02/13] staging: as102: Remove unnecessary typedefs Sylwester Nawrocki
2011-11-06 20:31 ` [PATCH 03/13] staging: as102: Remove leftovers of the SPI bus driver Sylwester Nawrocki
2011-11-06 20:31 ` [PATCH 04/13] staging: as102: Make the driver select CONFIG_FW_LOADER Sylwester Nawrocki
2011-11-06 20:31 ` [PATCH 05/13] staging: as102: Replace pragma(pack) with attribute __packed Sylwester Nawrocki
2011-11-06 20:31 ` [PATCH 06/13] staging: as102: Fix the dvb device registration error path Sylwester Nawrocki
2011-11-06 20:31 ` [PATCH 07/13] staging: as102: Whitespace and indentation cleanup Sylwester Nawrocki
2011-11-06 20:31 ` Sylwester Nawrocki [this message]
2011-11-06 20:31 ` [PATCH 09/13] staging: as102: Remove linkage specifiers for C++ Sylwester Nawrocki
2011-11-06 20:31 ` [PATCH 10/13] staging: as102: Use linux/uaccess.h instead of asm/uaccess.h Sylwester Nawrocki
2011-11-06 20:31 ` [PATCH 11/13] staging: as102: Move variable declarations to the header Sylwester Nawrocki
2011-11-06 20:31 ` [PATCH 12/13] staging: as102: Define device name string pointers constant Sylwester Nawrocki
2011-11-06 20:31 ` [PATCH 13/13] staging: as102: Eliminate as10x_handle_t alias Sylwester Nawrocki
[not found] ` <4EB7F709.2050503@gmail.com>
2011-11-07 19:55 ` [PATCH 00/13] Remaining coding style clean up of AS102 driver Sylwester Nawrocki
[not found] ` <4EB802A0.7030600@gmail.com>
2011-11-07 19:57 ` Sylwester Nawrocki
2011-11-07 20:06 ` Devin Heitmueller
2011-11-08 13:36 ` Mauro Carvalho Chehab
2011-11-08 22:40 ` Sylwester Nawrocki
2011-11-08 23:16 ` [PATCH] staging: as102: Add missing function argument Sylwester Nawrocki
2011-11-17 16:35 ` [PATCH] staging: as102: Add support for Sky Italia Digital Key based on the same chip Gianluca Gennari
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=1320611510-3326-9-git-send-email-snjw23@gmail.com \
--to=snjw23@gmail.com \
--cc=chmooreck@poczta.onet.pl \
--cc=dheitmueller@kernellabs.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.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