V4L/DVB (9116): USB: remove info() macro from usb media drivers

[pandora-kernel.git] / drivers / media / video / usbvideo / ibmcam.c

diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c
index cc27efe..28421d3 100644 (file)
--- a/drivers/media/video/usbvideo/ibmcam.c
+++ b/drivers/media/video/usbvideo/ibmcam.c
@@ -258,7 +258,9 @@ static enum ParseState ibmcam_find_header(struct uvd *uvd) /* FIXME: Add frame h
                            (RING_QUEUE_PEEK(&uvd->dp, 2) == 0x00))
                        {
 #if 0                          /* This code helps to detect new frame markers */
-                               info("Header sig: 00 FF 00 %02X", RING_QUEUE_PEEK(&uvd->dp, 3));
+                               dev_info(&uvd->dev->dev,
+                                        "Header sig: 00 FF 00 %02X\n",
+                                        RING_QUEUE_PEEK(&uvd->dp, 3));
 #endif
                                frame->header = RING_QUEUE_PEEK(&uvd->dp, 3);
                                if ((frame->header == HDRSIG_MODEL1_128x96) ||
@@ -266,7 +268,8 @@ static enum ParseState ibmcam_find_header(struct uvd *uvd) /* FIXME: Add frame h
                                    (frame->header == HDRSIG_MODEL1_352x288))
                                {
 #if 0
-                                       info("Header found.");
+                                       dev_info(&uvd->dev->dev,
+                                                "Header found.\n");
 #endif
                                        RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, marker_len);
                                        icam->has_hdr = 1;
@@ -295,7 +298,7 @@ case IBMCAM_MODEL_4:
                            (RING_QUEUE_PEEK(&uvd->dp, 1) == 0xFF))
                        {
 #if 0
-                               info("Header found.");
+                               dev_info(&uvd->dev->dev, "Header found.\n");
 #endif
                                RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, marker_len);
                                icam->has_hdr = 1;
@@ -338,7 +341,7 @@ case IBMCAM_MODEL_4:
                                byte4 = RING_QUEUE_PEEK(&uvd->dp, 3);
                                frame->header = (byte3 << 8) | byte4;
 #if 0
-                               info("Header found.");
+                               dev_info(&uvd->dev->dev, "Header found.\n");
 #endif
                                RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, marker_len);
                                icam->has_hdr = 1;
@@ -354,7 +357,8 @@ case IBMCAM_MODEL_4:
        }
        if (!icam->has_hdr) {
                if (uvd->debug > 2)
-                       info("Skipping frame, no header");
+                       dev_info(&uvd->dev->dev,
+                                "Skipping frame, no header\n");
                return scan_EndParse;
        }
 
@@ -881,7 +885,9 @@ static enum ParseState ibmcam_model3_parse_lines(
         */
        if ((frame->curline + 1) >= data_h) {
                if (uvd->debug >= 3)
-                       info("Reached line %d. (frame is done)", frame->curline);
+                       dev_info(&uvd->dev->dev,
+                                "Reached line %d. (frame is done)\n",
+                                frame->curline);
                return scan_NextFrame;
        }
 
@@ -954,8 +960,9 @@ static enum ParseState ibmcam_model3_parse_lines(
 
        if (frame->curline >= VIDEOSIZE_Y(frame->request)) {
                if (uvd->debug >= 3) {
-                       info("All requested lines (%ld.) done.",
-                            VIDEOSIZE_Y(frame->request));
+                       dev_info(&uvd->dev->dev,
+                                "All requested lines (%ld.) done.\n",
+                                VIDEOSIZE_Y(frame->request));
                }
                return scan_NextFrame;
        } else
@@ -1000,7 +1007,9 @@ static enum ParseState ibmcam_model4_128x96_parse_lines(
         */
        if ((frame->curline + 1) >= data_h) {
                if (uvd->debug >= 3)
-                       info("Reached line %d. (frame is done)", frame->curline);
+                       dev_info(&uvd->dev->dev,
+                                "Reached line %d. (frame is done)\n",
+                                frame->curline);
                return scan_NextFrame;
        }
 
@@ -1049,8 +1058,9 @@ static enum ParseState ibmcam_model4_128x96_parse_lines(
 
        if (frame->curline >= VIDEOSIZE_Y(frame->request)) {
                if (uvd->debug >= 3) {
-                       info("All requested lines (%ld.) done.",
-                            VIDEOSIZE_Y(frame->request));
+                       dev_info(&uvd->dev->dev,
+                                "All requested lines (%ld.) done.\n",
+                                VIDEOSIZE_Y(frame->request));
                }
                return scan_NextFrame;
        } else
@@ -1171,10 +1181,11 @@ static int ibmcam_veio(
                        sizeof(cp),
                        1000);
 #if 0
-               info("USB => %02x%02x%02x%02x%02x%02x%02x%02x "
-                      "(req=$%02x val=$%04x ind=$%04x)",
-                      cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],
-                      req, value, index);
+               dev_info(&uvd->dev->dev,
+                        "USB => %02x%02x%02x%02x%02x%02x%02x%02x "
+                        "(req=$%02x val=$%04x ind=$%04x)\n",
+                        cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],
+                        req, value, index);
 #endif
        } else {
                i = usb_control_msg(
@@ -1449,10 +1460,9 @@ static void ibmcam_adjust_contrast(struct uvd *uvd)
  */
 static void ibmcam_change_lighting_conditions(struct uvd *uvd)
 {
-       static const char proc[] = "ibmcam_change_lighting_conditions";
-
        if (debug > 0)
-               info("%s: Set lighting to %hu.", proc, lighting);
+               dev_info(&uvd->dev->dev,
+                        "%s: Set lighting to %hu.\n", __func__, lighting);
 
        switch (IBMCAM_T(uvd)->camera_model) {
        case IBMCAM_MODEL_1:
@@ -1495,8 +1505,6 @@ static void ibmcam_change_lighting_conditions(struct uvd *uvd)
  */
 static void ibmcam_set_sharpness(struct uvd *uvd)
 {
-       static const char proc[] = "ibmcam_set_sharpness";
-
        switch (IBMCAM_T(uvd)->camera_model) {
        case IBMCAM_MODEL_1:
        {
@@ -1505,7 +1513,8 @@ static void ibmcam_set_sharpness(struct uvd *uvd)
 
                RESTRICT_TO_RANGE(sharpness, SHARPNESS_MIN, SHARPNESS_MAX);
                if (debug > 0)
-                       info("%s: Set sharpness to %hu.", proc, sharpness);
+                       dev_info(&uvd->dev->dev, "%s: Set sharpness to %hu.\n",
+                                __func__, sharpness);
 
                sv = sa[sharpness - SHARPNESS_MIN];
                for (i=0; i < 2; i++) {
@@ -1564,11 +1573,11 @@ static void ibmcam_set_sharpness(struct uvd *uvd)
  */
 static void ibmcam_set_brightness(struct uvd *uvd)
 {
-       static const char proc[] = "ibmcam_set_brightness";
        static const unsigned short n = 1;
 
        if (debug > 0)
-               info("%s: Set brightness to %hu.", proc, uvd->vpic.brightness);
+               dev_info(&uvd->dev->dev, "%s: Set brightness to %hu.\n",
+                        __func__, uvd->vpic.brightness);
 
        switch (IBMCAM_T(uvd)->camera_model) {
        case IBMCAM_MODEL_1:
@@ -2115,7 +2124,8 @@ static void ibmcam_model2_setup_after_video_if(struct uvd *uvd)
                        break;
                }
                if (uvd->debug > 0)
-                       info("Framerate (hardware): %hd.", hw_fps);
+                       dev_info(&uvd->dev->dev, "Framerate (hardware): %hd.\n",
+                                hw_fps);
                RESTRICT_TO_RANGE(hw_fps, 0, 31);
                ibmcam_model2_Packet1(uvd, mod2_set_framerate, hw_fps);
        }
@@ -3487,7 +3497,7 @@ static void ibmcam_model3_setup_after_video_if(struct uvd *uvd)
        /* 01.01.08 - Added for RCA video in support -LO */
        if(init_model3_input) {
                if (debug > 0)
-                       info("Setting input to RCA.");
+                       dev_info(&uvd->dev->dev, "Setting input to RCA.\n");
                for (i=0; i < ARRAY_SIZE(initData); i++) {
                        ibmcam_veio(uvd, initData[i].req, initData[i].value, initData[i].index);
                }
@@ -3685,7 +3695,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
        unsigned char video_ep = 0;
 
        if (debug >= 1)
-               info("ibmcam_probe(%p,%u.)", intf, ifnum);
+               dev_info(&uvd->dev->dev, "ibmcam_probe(%p,%u.)\n", intf, ifnum);
 
        /* We don't handle multi-config cameras */
        if (dev->descriptor.bNumConfigurations != 1)
@@ -3736,14 +3746,16 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                        brand = "IBM PC Camera"; /* a.k.a. Xirlink C-It */
                        break;
                }
-               info("%s USB camera found (model %d, rev. 0x%04x)",
-                    brand, model, le16_to_cpu(dev->descriptor.bcdDevice));
+               dev_info(&uvd->dev->dev,
+                        "%s USB camera found (model %d, rev. 0x%04x)\n",
+                        brand, model, le16_to_cpu(dev->descriptor.bcdDevice));
        } while (0);
 
        /* Validate found interface: must have one ISO endpoint */
        nas = intf->num_altsetting;
        if (debug > 0)
-               info("Number of alternate settings=%d.", nas);
+               dev_info(&uvd->dev->dev, "Number of alternate settings=%d.\n",
+                        nas);
        if (nas < 2) {
                err("Too few alternate settings for this camera!");
                return -ENODEV;
@@ -3787,7 +3799,9 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                                actInterface = i;
                                maxPS = le16_to_cpu(endpoint->wMaxPacketSize);
                                if (debug > 0)
-                                       info("Active setting=%d. maxPS=%d.", i, maxPS);
+                                       dev_info(&uvd->dev->dev,
+                                                "Active setting=%d. "
+                                                "maxPS=%d.\n", i, maxPS);
                        } else
                                err("More than one active alt. setting! Ignoring #%d.", i);
                }
@@ -3826,7 +3840,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                        RESTRICT_TO_RANGE(framerate, 0, 5);
                        break;
                default:
-                       info("IBM camera: using 320x240");
+                       dev_info(&uvd->dev->dev, "IBM camera: using 320x240\n");
                        size = SIZE_320x240;
                        /* No break here */
                case SIZE_320x240:
@@ -3855,7 +3869,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                        canvasY = 120;
                        break;
                default:
-                       info("IBM NetCamera: using 176x144");
+                       dev_info(&uvd->dev->dev, "IBM NetCamera: using 176x144\n");
                        size = SIZE_176x144;
                        /* No break here */
                case SIZE_176x144: