Commit 2a18fbec authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Mauro Carvalho Chehab
Browse files

media: rcar-vin: Move pm_runtime_{get,put} out of helpers 



The helpers rvin_power_{on,off} deal with both VIN and the parallel
subdevice power. This makes it hard to merge the Gen2 and Gen3
open/release functions. Move the VIN power handling directly to the
open/release functions to prepare for the merge.

Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarUlrich Hecht <uli+renesas@fpond.eu>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 4e4ef86f

drivers/media/platform/rcar-vin/rcar-v4l2.c

+21 −14
Original line number Diff line number Diff line
@@ -754,8 +754,6 @@ static int rvin_power_on(struct rvin_dev *vin) 
	int ret;

	struct v4l2_subdev *sd = vin_to_source(vin);



	pm_runtime_get_sync(vin->v4l2_dev.dev);



	ret = v4l2_subdev_call(sd, core, s_power, 1);

	if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV)

		return ret;
@@ -768,9 +766,6 @@ static int rvin_power_off(struct rvin_dev *vin) 
	struct v4l2_subdev *sd = vin_to_source(vin);



	ret = v4l2_subdev_call(sd, core, s_power, 0);



	pm_runtime_put(vin->v4l2_dev.dev);



	if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV)

		return ret;
@@ -796,26 +791,36 @@ static int rvin_open(struct file *file) 
	struct rvin_dev *vin = video_drvdata(file);

	int ret;



	ret = pm_runtime_get_sync(vin->dev);

	if (ret < 0)

		return ret;



	ret = mutex_lock_interruptible(&vin->lock);

	if (ret)

		return ret;

		goto err_pm;



	file->private_data = vin;



	ret = v4l2_fh_open(file);

	if (ret)

		goto unlock;



	if (!v4l2_fh_is_singular_file(file))

		goto unlock;

		goto err_unlock;



	if (rvin_initialize_device(file)) {

		v4l2_fh_release(file);

		ret = -ENODEV;

	if (v4l2_fh_is_singular_file(file)) {

		ret = rvin_initialize_device(file);

		if (ret)

			goto err_open;

	}



unlock:

	mutex_unlock(&vin->lock);



	return 0;

err_open:

	v4l2_fh_release(file);

err_unlock:

	mutex_unlock(&vin->lock);

err_pm:

	pm_runtime_put(vin->dev);



	return ret;

}
@@ -842,6 +847,8 @@ static int rvin_release(struct file *file) 


	mutex_unlock(&vin->lock);



	pm_runtime_put(vin->dev);



	return ret;

}