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

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

[media] omap3isp: Replace printk with dev_* 



Use the dev_* message logging API instead of raw printk.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent aab84f55

drivers/media/platform/omap3isp/isp.c

+6 −6
Original line number Diff line number Diff line
@@ -1679,7 +1679,7 @@ isp_register_subdev_group(struct isp_device *isp, 


		adapter = i2c_get_adapter(board_info->i2c_adapter_id);

		if (adapter == NULL) {

			printk(KERN_ERR "%s: Unable to get I2C adapter %d for "

			dev_err(isp->dev, "%s: Unable to get I2C adapter %d for "

				"device %s\n", __func__,

				board_info->i2c_adapter_id,

				board_info->board_info->type);
@@ -1689,7 +1689,7 @@ isp_register_subdev_group(struct isp_device *isp, 
		subdev = v4l2_i2c_new_subdev_board(&isp->v4l2_dev, adapter,

				board_info->board_info, NULL);

		if (subdev == NULL) {

			printk(KERN_ERR "%s: Unable to register subdev %s\n",

			dev_err(isp->dev, "%s: Unable to register subdev %s\n",

				__func__, board_info->board_info->type);

			continue;

		}
@@ -1714,7 +1714,7 @@ static int isp_register_entities(struct isp_device *isp) 
	isp->media_dev.link_notify = isp_pipeline_link_notify;

	ret = media_device_register(&isp->media_dev);

	if (ret < 0) {

		printk(KERN_ERR "%s: Media device registration failed (%d)\n",

		dev_err(isp->dev, "%s: Media device registration failed (%d)\n",

			__func__, ret);

		return ret;

	}
@@ -1722,7 +1722,7 @@ static int isp_register_entities(struct isp_device *isp) 
	isp->v4l2_dev.mdev = &isp->media_dev;

	ret = v4l2_device_register(isp->dev, &isp->v4l2_dev);

	if (ret < 0) {

		printk(KERN_ERR "%s: V4L2 device registration failed (%d)\n",

		dev_err(isp->dev, "%s: V4L2 device registration failed (%d)\n",

			__func__, ret);

		goto done;

	}
@@ -1809,7 +1809,7 @@ static int isp_register_entities(struct isp_device *isp) 
			break;



		default:

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

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

				__func__, subdevs->interface);

			ret = -EINVAL;

			goto done;

drivers/media/platform/omap3isp/ispcsi2.c

+3 −3
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ int omap3isp_csi2_reset(struct isp_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(isp->dev, "CSI2: Soft reset try count exceeded!\n");

		return -EBUSY;

	}
@@ -535,7 +535,7 @@ int omap3isp_csi2_reset(struct isp_csi2_device *csi2) 
	} while (--i > 0);



	if (i == 0) {

		printk(KERN_ERR

		dev_err(isp->dev,

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

		return -EBUSY;

	}

drivers/media/platform/omap3isp/ispcsiphy.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int csiphy_set_power(struct isp_csiphy *phy, u32 power) 
	} while ((reg != power >> 2) && (retry_count < 100));



	if (retry_count == 100) {

		printk(KERN_ERR "CSI2 CIO set power failed!\n");

		dev_err(phy->isp->dev, "CSI2 CIO set power failed!\n");

		return -EBUSY;

	}

drivers/media/platform/omap3isp/ispvideo.c

+2 −1
Original line number Diff line number Diff line
@@ -1391,7 +1391,8 @@ int omap3isp_video_register(struct isp_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->isp->dev,

			"%s: could not register video device (%d)\n",

			__func__, ret);



	return ret;