Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cd89e91 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 8a38db13

drivers/staging/media/omap4iss/iss.c

+4 −4
Original line number Diff line number Diff line
@@ -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,7 +1175,7 @@ static int iss_register_entities(struct iss_device *iss) 
			break;



		default:

			printk(KERN_ERR "%s: invalid interface type %u\n",

			dev_err(iss->dev, "%s: invalid interface type %u\n",

				__func__, subdevs->interface);

			ret = -EINVAL;

			goto done;

drivers/staging/media/omap4iss/iss_csi2.c

+4 −3
Original line number Diff line number Diff line
@@ -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,7 +536,7 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2) 
	} while (--i > 0);



	if (i == 0) {

		printk(KERN_ERR

		dev_err(csi2->iss->dev,

			"CSI2: Reset for CSI2_96M_FCLK domain Failed!\n");

		return -EBUSY;

	}

drivers/staging/media/omap4iss/iss_csiphy.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/staging/media/omap4iss/iss_video.c

+2 −1
Original line number Diff line number Diff line
@@ -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;