[media] gspca: Use current logging styles

Add pr_fmt.
Convert usb style logging macros to pr_<level>.
Remove now unused old usb style logging macros.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index 61cdd56a74a9..9d78fb896518 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define MODULE_NAME "zc3xx"
 
 #include <linux/input.h>
@@ -5666,7 +5668,7 @@ static u8 reg_r_i(struct gspca_dev *gspca_dev,
                         index, gspca_dev->usb_buf, 1,
                         500);
         if (ret < 0) {
-                err("reg_r_i err %d", ret);
+                pr_err("reg_r_i err %d\n", ret);
                 gspca_dev->usb_err = ret;
                 return 0;
         }
@@ -5698,7 +5700,7 @@ static void reg_w_i(struct gspca_dev *gspca_dev,
                         value, index, NULL, 0,
                         500);
         if (ret < 0) {
-                err("reg_w_i err %d", ret);
+                pr_err("reg_w_i err %d\n", ret);
                 gspca_dev->usb_err = ret;
         }
 }
@@ -5724,7 +5726,7 @@ static u16 i2c_read(struct gspca_dev *gspca_dev,
         msleep(20);
         retbyte = reg_r_i(gspca_dev, 0x0091);           /* read status */
         if (retbyte != 0x00)
-                err("i2c_r status error %02x", retbyte);
+                pr_err("i2c_r status error %02x\n", retbyte);
         retval = reg_r_i(gspca_dev, 0x0095);            /* read Lowbyte */
         retval |= reg_r_i(gspca_dev, 0x0096) << 8;      /* read Hightbyte */
         PDEBUG(D_USBI, "i2c r [%02x] -> %04x (%02x)",
@@ -5748,7 +5750,7 @@ static u8 i2c_write(struct gspca_dev *gspca_dev,
         msleep(1);
         retbyte = reg_r_i(gspca_dev, 0x0091);           /* read status */
         if (retbyte != 0x00)
-                err("i2c_w status error %02x", retbyte);
+                pr_err("i2c_w status error %02x\n", retbyte);
         PDEBUG(D_USBO, "i2c w [%02x] = %02x%02x (%02x)",
                         reg, valH, valL, retbyte);
         return retbyte;
@@ -6497,7 +6499,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
                                 PDEBUG(D_PROBE, "Sensor GC0303");
                                 break;
                         default:
-                                warn("Unknown sensor - set to TAS5130C");
+                                pr_warn("Unknown sensor - set to TAS5130C\n");
                                 sd->sensor = SENSOR_TAS5130C;
                         }
                         break;
@@ -6603,7 +6605,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
                         sd->sensor = SENSOR_OV7620;     /* same sensor (?) */
                         break;
                 default:
-                        err("Unknown sensor %04x", sensor);
+                        pr_err("Unknown sensor %04x\n", sensor);
                         return -EINVAL;
                 }
         }