[media] v4l: omap4iss: Replace printk by dev_err

dev_err is preferred over printk(KERN_ERR) when a device pointer is
available.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index b7c8a6bc7d804509d91e379e945bff0fd3c6b6cc..3ac986e6289ceb7235206023b78afac749909832 100644 (file)
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -1108,7 +1108,7 @@ static int iss_register_entities(struct iss_device *iss)
        iss->media_dev.link_notify = iss_pipeline_link_notify;
        ret = media_device_register(&iss->media_dev);
        if (ret < 0) {
-               printk(KERN_ERR "%s: Media device registration failed (%d)\n",
+               dev_err(iss->dev, "%s: Media device registration failed (%d)\n",
                        __func__, ret);
                return ret;
        }
@@ -1116,7 +1116,7 @@ static int iss_register_entities(struct iss_device *iss)
        iss->v4l2_dev.mdev = &iss->media_dev;
        ret = v4l2_device_register(iss->dev, &iss->v4l2_dev);
        if (ret < 0) {
-               printk(KERN_ERR "%s: V4L2 device registration failed (%d)\n",
+               dev_err(iss->dev, "%s: V4L2 device registration failed (%d)\n",
                        __func__, ret);
                goto done;
        }
@@ -1175,8 +1175,8 @@ static int iss_register_entities(struct iss_device *iss)
                        break;
 
                default:
-                       printk(KERN_ERR "%s: invalid interface type %u\n",
-                              __func__, subdevs->interface);
+                       dev_err(iss->dev, "%s: invalid interface type %u\n",
+                               __func__, subdevs->interface);
                        ret = -EINVAL;
                        goto done;
                }

diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c
index 0ee8381c738d716562c627ed5b8d6ed8a1f9f367..9ced9ce5c2017fd74ab2a242a10432a6e5b4fa05 100644 (file)
--- a/drivers/staging/media/omap4iss/iss_csi2.c
+++ b/drivers/staging/media/omap4iss/iss_csi2.c
@@ -517,7 +517,8 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2)
        } while (soft_reset_retries < 5);
 
        if (soft_reset_retries == 5) {
-               printk(KERN_ERR "CSI2: Soft reset try count exceeded!\n");
+               dev_err(csi2->iss->dev,
+                       "CSI2: Soft reset try count exceeded!\n");
                return -EBUSY;
        }
 
@@ -535,8 +536,8 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2)
        } while (--i > 0);
 
        if (i == 0) {
-               printk(KERN_ERR
-                      "CSI2: Reset for CSI2_96M_FCLK domain Failed!\n");
+               dev_err(csi2->iss->dev,
+                       "CSI2: Reset for CSI2_96M_FCLK domain Failed!\n");
                return -EBUSY;
        }
 

diff --git a/drivers/staging/media/omap4iss/iss_csiphy.c b/drivers/staging/media/omap4iss/iss_csiphy.c
index 2afea98106a60758927aaa68316565e4ecb4a5b7..e0d02473d964c1e662df2fefb9fe64abf27d2c9b 100644 (file)
--- a/drivers/staging/media/omap4iss/iss_csiphy.c
+++ b/drivers/staging/media/omap4iss/iss_csiphy.c
@@ -78,7 +78,7 @@ static int csiphy_set_power(struct iss_csiphy *phy, u32 power)
        } while ((reg != power >> 2) && (retry_count < 250));
 
        if (retry_count == 250) {
-               printk(KERN_ERR "CSI2 CIO set power failed!\n");
+               dev_err(phy->iss->dev, "CSI2 CIO set power failed!\n");
                return -EBUSY;
        }
 

diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 766491e6a8d0e5670be3236b6239248942ba35ac..5a92bac70bd612705a0983093ac5bf823d22ffae 100644 (file)
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -1116,7 +1116,8 @@ int omap4iss_video_register(struct iss_video *video, struct v4l2_device *vdev)
 
        ret = video_register_device(&video->video, VFL_TYPE_GRABBER, -1);
        if (ret < 0)
-               printk(KERN_ERR "%s: could not register video device (%d)\n",
+               dev_err(video->iss->dev,
+                       "%s: could not register video device (%d)\n",
                        __func__, ret);
 
        return ret;