Commit a2c77032 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: Remove bogus asd == NULL checks 



The asd is a sub-structure of the main driver data struct, so it is
never NULL. Drop the unnecessary NULL checks in a couple of places.

Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/linux-media/533f6930-434a-45f3-afff-127003fa64c9@moroto.mountain/


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent f33cb490

drivers/staging/media/atomisp/pci/atomisp_cmd.c

+0 −24
Original line number Diff line number Diff line
@@ -3001,12 +3001,6 @@ void atomisp_handle_parameter_and_buffer(struct atomisp_video_pipe *pipe) 
	bool need_to_enqueue_buffer = false;

	int i;



	if (!asd) {

		dev_err(pipe->isp->dev, "%s(): asd is NULL, device is %s\n",

			__func__, pipe->vdev.name);

		return;

	}



	lockdep_assert_held(&asd->isp->mutex);



	/*
@@ -3068,12 +3062,6 @@ int atomisp_set_parameters(struct video_device *vdev, 
	struct atomisp_css_params *css_param = &asd->params.css_param;

	int ret;



	if (!asd) {

		dev_err(pipe->isp->dev, "%s(): asd is NULL, device is %s\n",

			__func__, vdev->name);

		return -EINVAL;

	}



	lockdep_assert_held(&asd->isp->mutex);



	if (!asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL].stream) {
@@ -4067,12 +4055,6 @@ static int atomisp_set_fmt_to_isp(struct video_device *vdev, 
	const struct atomisp_in_fmt_conv *fc = NULL;

	int ret, i;



	if (!asd) {

		dev_err(isp->dev, "%s(): asd is NULL, device is %s\n",

			__func__, vdev->name);

		return -EINVAL;

	}



	isp_sink_crop = atomisp_subdev_get_rect(

			    &asd->subdev, NULL, V4L2_SUBDEV_FORMAT_ACTIVE,

			    ATOMISP_SUBDEV_PAD_SINK, V4L2_SEL_TGT_CROP);
@@ -4280,12 +4262,6 @@ static int atomisp_set_fmt_to_snr(struct video_device *vdev, const struct v4l2_p 
	    (struct atomisp_input_stream_info *)ffmt->reserved;

	int ret;



	if (!asd) {

		dev_err(pipe->isp->dev, "%s(): asd is NULL, device is %s\n",

			__func__, vdev->name);

		return -EINVAL;

	}



	format = atomisp_get_format_bridge(f->pixelformat);

	if (!format)

		return -EINVAL;

drivers/staging/media/atomisp/pci/atomisp_compat_css20.c

+0 −3
Original line number Diff line number Diff line
@@ -613,9 +613,6 @@ static void __apply_additional_pipe_config( 
static bool is_pipe_valid_to_current_run_mode(struct atomisp_sub_device *asd,

	enum ia_css_pipe_id pipe_id)

{

	if (!asd)

		return false;



	if (pipe_id == IA_CSS_PIPE_ID_YUVPP)

		return true;