[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>

diff --git a/drivers/staging/media/as102/as102_fw.c b/drivers/staging/media/as102/as102_fw.c
index ab7dcdb0ad662df6e878a31e0cf8f3e36d94dfff..fa569392bb7eea966deec2e318337b9fdc6bef72 100644 (file)
--- 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 e0c38548ce2d68f474a56ea00987ca8b33371a0b..3ded7d6fc77f79293db360ed1b5ee5dd24a5b446 100644 (file)
--- 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;
        }