Commit 2aa8e838 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[media] smiapp: Remove useless newlines and other small cleanups 



The code probably has been unindented at some point but rewrapping has not
been done. Do it now.

Also remove a useless memory allocation failure message.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarSebastian Reichel <sre@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent e43665a9

drivers/media/i2c/smiapp/smiapp-core.c

+13 −20
Original line number Diff line number Diff line
@@ -446,8 +446,7 @@ static int smiapp_set_ctrl(struct v4l2_ctrl *ctrl) 
			orient |= SMIAPP_IMAGE_ORIENTATION_VFLIP;



		orient ^= sensor->hvflip_inv_mask;

		rval = smiapp_write(sensor,

				    SMIAPP_REG_U8_IMAGE_ORIENTATION,

		rval = smiapp_write(sensor, SMIAPP_REG_U8_IMAGE_ORIENTATION,

				    orient);

		if (rval < 0)

			return rval;
@@ -462,10 +461,8 @@ static int smiapp_set_ctrl(struct v4l2_ctrl *ctrl) 
		__smiapp_update_exposure_limits(sensor);



		if (exposure > sensor->exposure->maximum) {

			sensor->exposure->val =

				sensor->exposure->maximum;

			rval = smiapp_set_ctrl(

				sensor->exposure);

			sensor->exposure->val =	sensor->exposure->maximum;

			rval = smiapp_set_ctrl(sensor->exposure);

			if (rval < 0)

				return rval;

		}
@@ -1322,8 +1319,7 @@ static int smiapp_power_on(struct smiapp_sensor *sensor) 
	if (!sensor->pixel_array)

		return 0;



	rval = v4l2_ctrl_handler_setup(

		&sensor->pixel_array->ctrl_handler);

	rval = v4l2_ctrl_handler_setup(&sensor->pixel_array->ctrl_handler);

	if (rval)

		goto out_cci_addr_fail;
@@ -1629,7 +1625,8 @@ static int __smiapp_get_format(struct v4l2_subdev *subdev, 
	struct smiapp_subdev *ssd = to_smiapp_subdev(subdev);



	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {

		fmt->format = *v4l2_subdev_get_try_format(subdev, cfg, fmt->pad);

		fmt->format = *v4l2_subdev_get_try_format(subdev, cfg,

							  fmt->pad);

	} else {

		struct v4l2_rect *r;
@@ -1729,7 +1726,6 @@ static void smiapp_propagate(struct v4l2_subdev *subdev, 
static const struct smiapp_csi_data_format

*smiapp_validate_csi_data_format(struct smiapp_sensor *sensor, u32 code)

{

	const struct smiapp_csi_data_format *csi_format = sensor->csi_format;

	unsigned int i;



	for (i = 0; i < ARRAY_SIZE(smiapp_csi_data_formats); i++) {
@@ -1738,7 +1734,7 @@ static const struct smiapp_csi_data_format 
			return &smiapp_csi_data_formats[i];

	}



	return csi_format;

	return sensor->csi_format;

}



static int smiapp_set_format_source(struct v4l2_subdev *subdev,
@@ -2072,8 +2068,7 @@ static int smiapp_set_compose(struct v4l2_subdev *subdev, 
		smiapp_set_compose_scaler(subdev, cfg, sel, crops, comp);



	*comp = sel->r;

	smiapp_propagate(subdev, cfg, sel->which,

			 V4L2_SEL_TGT_COMPOSE);

	smiapp_propagate(subdev, cfg, sel->which, V4L2_SEL_TGT_COMPOSE);



	if (sel->which == V4L2_SUBDEV_FORMAT_ACTIVE)

		return smiapp_update_mode(sensor);
@@ -2150,8 +2145,7 @@ static int smiapp_set_crop(struct v4l2_subdev *subdev, 
				->height;

			src_size = &_r;

		} else {

			src_size =

				v4l2_subdev_get_try_compose(

			src_size = v4l2_subdev_get_try_compose(

				subdev, cfg, ssd->sink_pad);

		}

	}
@@ -2638,7 +2632,8 @@ static int smiapp_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) 
	for (i = 0; i < ssd->npads; i++) {

		struct v4l2_mbus_framefmt *try_fmt =

			v4l2_subdev_get_try_format(sd, fh->pad, i);

		struct v4l2_rect *try_crop = v4l2_subdev_get_try_crop(sd, fh->pad, i);

		struct v4l2_rect *try_crop =

			v4l2_subdev_get_try_crop(sd, fh->pad, i);

		struct v4l2_rect *try_comp;



		smiapp_get_native_size(ssd, try_crop);
@@ -2878,8 +2873,7 @@ static int smiapp_probe(struct i2c_client *client, 
		return -EPROBE_DEFER;

	}



	rval = clk_set_rate(sensor->ext_clk,

			    sensor->hwcfg->ext_clk);

	rval = clk_set_rate(sensor->ext_clk, sensor->hwcfg->ext_clk);

	if (rval < 0) {

		dev_err(&client->dev,

			"unable to set clock freq to %u\n",
@@ -2980,7 +2974,6 @@ static int smiapp_probe(struct i2c_client *client, 
		sensor->nvm = devm_kzalloc(&client->dev,

				sensor->hwcfg->nvm_size, GFP_KERNEL);

		if (sensor->nvm == NULL) {

			dev_err(&client->dev, "nvm buf allocation failed\n");

			rval = -ENOMEM;

			goto out_cleanup;

		}