[media] gspca: Use current logging styles

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / media / video / gspca / xirlink_cit.c

diff --git a/drivers/media/video/gspca/xirlink_cit.c b/drivers/media/video/gspca/xirlink_cit.c
index c089a0f6f1d034924553357e6645584bb82504ea..3aed42acdb5ae82bc9eb21d9113c14593dd4cf8c 100644 (file)
--- a/drivers/media/video/gspca/xirlink_cit.c
+++ b/drivers/media/video/gspca/xirlink_cit.c
@@ -27,6 +27,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define MODULE_NAME "xirlink-cit"
 
 #include <linux/input.h>
@@ -800,8 +802,8 @@ static int cit_write_reg(struct gspca_dev *gspca_dev, u16 value, u16 index)
                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT,
                        value, index, NULL, 0, 1000);
        if (err < 0)
-               err("Failed to write a register (index 0x%04X,"
-                       " value 0x%02X, error %d)", index, value, err);
+               pr_err("Failed to write a register (index 0x%04X, value 0x%02X, error %d)\n",
+                      index, value, err);
 
        return 0;
 }
@@ -816,8 +818,8 @@ static int cit_read_reg(struct gspca_dev *gspca_dev, u16 index, int verbose)
                        USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT,
                        0x00, index, buf, 8, 1000);
        if (res < 0) {
-               err("Failed to read a register (index 0x%04X, error %d)",
-                       index, res);
+               pr_err("Failed to read a register (index 0x%04X, error %d)\n",
+                      index, res);
                return res;
        }
 
@@ -1587,7 +1589,7 @@ static int cit_get_packet_size(struct gspca_dev *gspca_dev)
        intf = usb_ifnum_to_if(gspca_dev->dev, gspca_dev->iface);
        alt = usb_altnum_to_altsetting(intf, gspca_dev->alt);
        if (!alt) {
-               err("Couldn't get altsetting");
+               pr_err("Couldn't get altsetting\n");
                return -EIO;
        }
 
@@ -2824,7 +2826,7 @@ static int sd_isoc_nego(struct gspca_dev *gspca_dev)
 
        ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface, 1);
        if (ret < 0)
-               err("set alt 1 err %d", ret);
+               pr_err("set alt 1 err %d\n", ret);
 
        return ret;
 }