Commit b1f8e931 authored by Dafna Hirschfeld's avatar Dafna Hirschfeld Committed by Mauro Carvalho Chehab
Browse files

media: vimc: move the dev field of each entity to vimc_ent_dev 



Since the 'struct device *dev' field exists in each of the
entity structs, it can be moved to the common struct vimc_ent_devevice.
It is then used to replace 'pr_err' with 'dev_err' in the streamer
code.

Signed-off-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 23df45d0

drivers/media/platform/vimc/vimc-capture.c

+3 −4
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
struct vimc_cap_device {

	struct vimc_ent_device ved;

	struct video_device vdev;

	struct device *dev;

	struct v4l2_pix_format format;

	struct vb2_queue queue;

	struct list_head buf_list;
@@ -125,7 +124,7 @@ static int vimc_cap_s_fmt_vid_cap(struct file *file, void *priv, 
	if (ret)

		return ret;



	dev_dbg(vcap->dev, "%s: format update: "

	dev_dbg(vcap->ved.dev, "%s: format update: "

		"old:%dx%d (0x%x, %d, %d, %d, %d) "

		"new:%dx%d (0x%x, %d, %d, %d, %d)\n", vcap->vdev.name,

		/* old */
@@ -301,7 +300,7 @@ static int vimc_cap_buffer_prepare(struct vb2_buffer *vb) 
	unsigned long size = vcap->format.sizeimage;



	if (vb2_plane_size(vb, 0) < size) {

		dev_err(vcap->dev, "%s: buffer too small (%lu < %lu)\n",

		dev_err(vcap->ved.dev, "%s: buffer too small (%lu < %lu)\n",

			vcap->vdev.name, vb2_plane_size(vb, 0), size);

		return -EINVAL;

	}
@@ -444,7 +443,7 @@ struct vimc_ent_device *vimc_cap_add(struct vimc_device *vimc, 
	vcap->ved.ent = &vcap->vdev.entity;

	vcap->ved.process_frame = vimc_cap_process_frame;

	vcap->ved.vdev_get_format = vimc_cap_get_format;

	vcap->dev = &vimc->pdev.dev;

	vcap->ved.dev = &vimc->pdev.dev;



	/* Initialize the video_device struct */

	vdev = &vcap->vdev;

drivers/media/platform/vimc/vimc-common.h

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ struct vimc_pix_map { 
 * struct vimc_ent_device - core struct that represents an entity in the

 * topology

 *

 * @dev:		a pointer of the device struct of the driver

 * @ent:		the pointer to struct media_entity for the node

 * @process_frame:	callback send a frame to that node

 * @vdev_get_format:	callback that returns the current format a pad, used
@@ -93,6 +94,7 @@ struct vimc_pix_map { 
 * media_entity

 */

struct vimc_ent_device {

	struct device *dev;

	struct media_entity *ent;

	void * (*process_frame)(struct vimc_ent_device *ved,

				const void *frame);

drivers/media/platform/vimc/vimc-debayer.c

+7 −8
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ struct vimc_deb_pix_map { 
struct vimc_deb_device {

	struct vimc_ent_device ved;

	struct v4l2_subdev sd;

	struct device *dev;

	/* The active format */

	struct v4l2_mbus_framefmt sink_fmt;

	u32 src_code;
@@ -264,7 +263,7 @@ static int vimc_deb_set_fmt(struct v4l2_subdev *sd, 
		/* Set the new format in the sink pad */

		vimc_deb_adjust_sink_fmt(&fmt->format);



		dev_dbg(vdeb->dev, "%s: sink format update: "

		dev_dbg(vdeb->ved.dev, "%s: sink format update: "

			"old:%dx%d (0x%x, %d, %d, %d, %d) "

			"new:%dx%d (0x%x, %d, %d, %d, %d)\n", vdeb->sd.name,

			/* old */
@@ -387,7 +386,7 @@ static void vimc_deb_calc_rgb_sink(struct vimc_deb_device *vdeb, 


	/* Sum the values of the colors in the mean window */



	dev_dbg(vdeb->dev,

	dev_dbg(vdeb->ved.dev,

		"deb: %s: --- Calc pixel %dx%d, window mean %d, seek %d ---\n",

		vdeb->sd.name, lin, col, vdeb->sink_fmt.height, seek);
@@ -420,7 +419,7 @@ static void vimc_deb_calc_rgb_sink(struct vimc_deb_device *vdeb, 
						 vdeb->sink_fmt.width,

						 vdeb->sink_bpp);



			dev_dbg(vdeb->dev,

			dev_dbg(vdeb->ved.dev,

				"deb: %s: RGB CALC: frame index %d, win pos %dx%d, color %d\n",

				vdeb->sd.name, index, wlin, wcol, color);
@@ -431,21 +430,21 @@ static void vimc_deb_calc_rgb_sink(struct vimc_deb_device *vdeb, 
			/* Save how many values we already added */

			n_rgb[color]++;



			dev_dbg(vdeb->dev, "deb: %s: RGB CALC: val %d, n %d\n",

			dev_dbg(vdeb->ved.dev, "deb: %s: RGB CALC: val %d, n %d\n",

				vdeb->sd.name, rgb[color], n_rgb[color]);

		}

	}



	/* Calculate the mean */

	for (i = 0; i < 3; i++) {

		dev_dbg(vdeb->dev,

		dev_dbg(vdeb->ved.dev,

			"deb: %s: PRE CALC: %dx%d Color %d, val %d, n %d\n",

			vdeb->sd.name, lin, col, i, rgb[i], n_rgb[i]);



		if (n_rgb[i])

			rgb[i] = rgb[i] / n_rgb[i];



		dev_dbg(vdeb->dev,

		dev_dbg(vdeb->ved.dev,

			"deb: %s: FINAL CALC: %dx%d Color %d, val %d\n",

			vdeb->sd.name, lin, col, i, rgb[i]);

	}
@@ -521,7 +520,7 @@ struct vimc_ent_device *vimc_deb_add(struct vimc_device *vimc, 
	}



	vdeb->ved.process_frame = vimc_deb_process_frame;

	vdeb->dev = &vimc->pdev.dev;

	vdeb->ved.dev = &vimc->pdev.dev;



	/* Initialize the frame format */

	vdeb->sink_fmt = sink_fmt_default;

drivers/media/platform/vimc/vimc-scaler.c

+5 −6
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ MODULE_PARM_DESC(sca_mult, " the image size multiplier"); 
struct vimc_sca_device {

	struct vimc_ent_device ved;

	struct v4l2_subdev sd;

	struct device *dev;

	/* NOTE: the source fmt is the same as the sink

	 * with the width and hight multiplied by mult

	 */
@@ -172,7 +171,7 @@ static int vimc_sca_set_fmt(struct v4l2_subdev *sd, 
		/* Set the new format in the sink pad */

		vimc_sca_adjust_sink_fmt(&fmt->format);



		dev_dbg(vsca->dev, "%s: sink format update: "

		dev_dbg(vsca->ved.dev, "%s: sink format update: "

			"old:%dx%d (0x%x, %d, %d, %d, %d) "

			"new:%dx%d (0x%x, %d, %d, %d, %d)\n", vsca->sd.name,

			/* old */
@@ -272,7 +271,7 @@ static void vimc_sca_scale_pix(const struct vimc_sca_device *const vsca, 
				 vsca->bpp);

	pixel = &sink_frame[index];



	dev_dbg(vsca->dev,

	dev_dbg(vsca->ved.dev,

		"sca: %s: --- scale_pix sink pos %dx%d, index %d ---\n",

		vsca->sd.name, lin, col, index);
@@ -282,7 +281,7 @@ static void vimc_sca_scale_pix(const struct vimc_sca_device *const vsca, 
	index = VIMC_FRAME_INDEX(lin * sca_mult, col * sca_mult,

				 vsca->sink_fmt.width * sca_mult, vsca->bpp);



	dev_dbg(vsca->dev, "sca: %s: scale_pix src pos %dx%d, index %d\n",

	dev_dbg(vsca->ved.dev, "sca: %s: scale_pix src pos %dx%d, index %d\n",

		vsca->sd.name, lin * sca_mult, col * sca_mult, index);



	/* Repeat this pixel mult times */
@@ -291,7 +290,7 @@ static void vimc_sca_scale_pix(const struct vimc_sca_device *const vsca, 
		 * pixel repetition in a line

		 */

		for (j = 0; j < sca_mult * vsca->bpp; j += vsca->bpp) {

			dev_dbg(vsca->dev,

			dev_dbg(vsca->ved.dev,

				"sca: %s: sca: scale_pix src pos %d\n",

				vsca->sd.name, index + j);
@@ -380,7 +379,7 @@ struct vimc_ent_device *vimc_sca_add(struct vimc_device *vimc, 
	}



	vsca->ved.process_frame = vimc_sca_process_frame;

	vsca->dev = &vimc->pdev.dev;

	vsca->ved.dev = &vimc->pdev.dev;



	/* Initialize the frame format */

	vsca->sink_fmt = sink_fmt_default;

drivers/media/platform/vimc/vimc-sensor.c

+2 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
struct vimc_sen_device {

	struct vimc_ent_device ved;

	struct v4l2_subdev sd;

	struct device *dev;

	struct tpg_data tpg;

	struct task_struct *kthread_sen;

	u8 *frame;
@@ -159,7 +158,7 @@ static int vimc_sen_set_fmt(struct v4l2_subdev *sd, 
	/* Set the new format */

	vimc_sen_adjust_fmt(&fmt->format);



	dev_dbg(vsen->dev, "%s: format update: "

	dev_dbg(vsen->ved.dev, "%s: format update: "

		"old:%dx%d (0x%x, %d, %d, %d, %d) "

		"new:%dx%d (0x%x, %d, %d, %d, %d)\n", vsen->sd.name,

		/* old */
@@ -376,7 +375,7 @@ struct vimc_ent_device *vimc_sen_add(struct vimc_device *vimc, 
		goto err_free_tpg;



	vsen->ved.process_frame = vimc_sen_process_frame;

	vsen->dev = &vimc->pdev.dev;

	vsen->ved.dev = &vimc->pdev.dev;



	/* Initialize the frame format */

	vsen->mbus_format = fmt_default;