Merge tag 'asoc-v4.16-4' into asoc-next

[sfrench/cifs-2.6.git] / drivers / media / usb / gspca / xirlink_cit.c

diff --git a/drivers/media/usb/gspca/xirlink_cit.c b/drivers/media/usb/gspca/xirlink_cit.c
index 68656e7986c752c982e65fea98d563cb12c7f03e..58deb0c388267b07fed4c80e13c38db1728595fb 100644 (file)
--- a/drivers/media/usb/gspca/xirlink_cit.c
+++ b/drivers/media/usb/gspca/xirlink_cit.c
@@ -704,7 +704,8 @@ static int cit_read_reg(struct gspca_dev *gspca_dev, u16 index, int verbose)
        }
 
        if (verbose)
-               PDEBUG(D_PROBE, "Register %04x value: %02x", index, buf[0]);
+               gspca_dbg(gspca_dev, D_PROBE, "Register %04x value: %02x\n",
+                         index, buf[0]);
 
        return 0;
 }
@@ -1471,10 +1472,11 @@ static int cit_get_clock_div(struct gspca_dev *gspca_dev)
                        fps[clock_div - 1] * 3 / 2)
                clock_div--;
 
-       PDEBUG(D_PROBE,
-              "PacketSize: %d, res: %dx%d -> using clockdiv: %d (%d fps)",
-              packet_size, gspca_dev->pixfmt.width, gspca_dev->pixfmt.height,
-              clock_div, fps[clock_div]);
+       gspca_dbg(gspca_dev, D_PROBE,
+                 "PacketSize: %d, res: %dx%d -> using clockdiv: %d (%d fps)\n",
+                 packet_size,
+                 gspca_dev->pixfmt.width, gspca_dev->pixfmt.height,
+                 clock_div, fps[clock_div]);
 
        return clock_div;
 }
@@ -2865,17 +2867,17 @@ static u8 *cit_find_sof(struct gspca_dev *gspca_dev, u8 *data, int len)
                                sd->sof_read = 0;
                                if (data[i] == 0xff) {
                                        if (i >= 4)
-                                               PDEBUG(D_FRAM,
-                                                      "header found at offset: %d: %02x %02x 00 %3ph\n",
-                                                      i - 1,
-                                                      data[i - 4],
-                                                      data[i - 3],
-                                                      &data[i]);
+                                               gspca_dbg(gspca_dev, D_FRAM,
+                                                         "header found at offset: %d: %02x %02x 00 %3ph\n\n",
+                                                         i - 1,
+                                                         data[i - 4],
+                                                         data[i - 3],
+                                                         &data[i]);
                                        else
-                                               PDEBUG(D_FRAM,
-                                                      "header found at offset: %d: 00 %3ph\n",
-                                                      i - 1,
-                                                      &data[i]);
+                                               gspca_dbg(gspca_dev, D_FRAM,
+                                                         "header found at offset: %d: 00 %3ph\n\n",
+                                                         i - 1,
+                                                         &data[i]);
                                        return data + i + (sd->sof_len - 1);
                                }
                                break;