[media] gspca: Use current logging styles

[deliverable/linux.git] / drivers / media / video / gspca / konica.c

diff --git a/drivers/media/video/gspca/konica.c b/drivers/media/video/gspca/konica.c
index 5964691c0e95e66f8b6c56905181ba0281822b6f..f3f7fe0ec4b721bb679b5a6b2299f3b079b7cb9b 100644 (file)
--- a/drivers/media/video/gspca/konica.c
+++ b/drivers/media/video/gspca/konica.c
@@ -28,6 +28,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define MODULE_NAME "konica"
 
 #include <linux/input.h>
@@ -200,7 +202,7 @@ static void reg_w(struct gspca_dev *gspca_dev, u16 value, u16 index)
                        0,
                        1000);
        if (ret < 0) {
-               err("reg_w err %d", ret);
+               pr_err("reg_w err %d\n", ret);
                gspca_dev->usb_err = ret;
        }
 }
@@ -221,7 +223,7 @@ static void reg_r(struct gspca_dev *gspca_dev, u16 value, u16 index)
                        2,
                        1000);
        if (ret < 0) {
-               err("reg_w err %d", ret);
+               pr_err("reg_w err %d\n", ret);
                gspca_dev->usb_err = ret;
        }
 }
@@ -284,7 +286,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
        intf = usb_ifnum_to_if(sd->gspca_dev.dev, sd->gspca_dev.iface);
        alt = usb_altnum_to_altsetting(intf, sd->gspca_dev.alt);
        if (!alt) {
-               err("Couldn't get altsetting");
+               pr_err("Couldn't get altsetting\n");
                return -EIO;
        }
 
@@ -315,7 +317,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
                        le16_to_cpu(alt->endpoint[i].desc.wMaxPacketSize);
                urb = usb_alloc_urb(SD_NPKT, GFP_KERNEL);
                if (!urb) {
-                       err("usb_alloc_urb failed");
+                       pr_err("usb_alloc_urb failed\n");
                        return -ENOMEM;
                }
                gspca_dev->urb[n] = urb;
@@ -324,7 +326,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
                                                GFP_KERNEL,
                                                &urb->transfer_dma);
                if (urb->transfer_buffer == NULL) {
-                       err("usb_buffer_alloc failed");
+                       pr_err("usb_buffer_alloc failed\n");
                        return -ENOMEM;
                }
 
@@ -386,7 +388,7 @@ static void sd_isoc_irq(struct urb *urb)
                PDEBUG(D_ERR, "urb status: %d", urb->status);
                st = usb_submit_urb(urb, GFP_ATOMIC);
                if (st < 0)
-                       err("resubmit urb error %d", st);
+                       pr_err("resubmit urb error %d\n", st);
                return;
        }
 
@@ -477,7 +479,7 @@ resubmit:
        }
        st = usb_submit_urb(status_urb, GFP_ATOMIC);
        if (st < 0)
-               err("usb_submit_urb(status_urb) ret %d", st);
+               pr_err("usb_submit_urb(status_urb) ret %d\n", st);
 }
 
 static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)