openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] staging: as102: Replace printk(KERN_<LEVEL> witk pr_<level> 

While at it also correct some spelling errors.

Cc: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Sylwester Nawrocki <snjw23@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sylwester Nawrocki 2011-11-06 16:31:45 -03:00 committed by Mauro Carvalho Chehab
parent 14e0e4bf6c
commit 7d462fe580
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/media/as102/as102_fw.c
View File

@ -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,7 +191,7 @@ 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",
pr_err("%s: unable to locate firmware file: %s\n",
DRIVER_NAME, fw1);
goto error;
}
@ -199,12 +199,12 @@ int as102_fw_upload(struct as102_bus_adapter_t *bus_adap)
/* 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",
pr_err("%s: error during firmware upload part1\n",
DRIVER_NAME);
goto error;
}
printk(KERN_INFO "%s: fimrware: %s loaded with success\n",
pr_info("%s: firmware: %s loaded with success\n",
DRIVER_NAME, fw1);
release_firmware(firmware);
@ -214,7 +214,7 @@ 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",
pr_err("%s: unable to locate firmware file: %s\n",
DRIVER_NAME, fw2);
goto error;
}
@ -222,12 +222,12 @@ int as102_fw_upload(struct as102_bus_adapter_t *bus_adap)
/* 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",
pr_err("%s: error during firmware upload part2\n",
DRIVER_NAME);
goto error;
}
printk(KERN_INFO "%s: fimrware: %s loaded with success\n",
pr_info("%s: firmware: %s loaded with success\n",
DRIVER_NAME, fw2);
error:
/* free data buffer */

8
drivers/staging/media/as102/as102_usb_drv.c
View File

@ -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,7 +432,7 @@ 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",
pr_err("%s: can't find device for minor %d\n",
__func__, minor);
ret = -ENODEV;
goto exit;