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

Commit 6208aebd authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[media] smiapp: Clean up smiapp_init_controls() 



Clean up smiapp_init_controls() by adding newlines to appropriate places and
by removing superfluous error handling. The caller will clean up control
handlers in any case if the function fails.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent f7350a03

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

+6 −13
Original line number Diff line number Diff line
@@ -527,6 +527,7 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor) 
	rval = v4l2_ctrl_handler_init(&sensor->pixel_array->ctrl_handler, 12);

	if (rval)

		return rval;



	sensor->pixel_array->ctrl_handler.lock = &sensor->mutex;



	sensor->analog_gain = v4l2_ctrl_new_std(
@@ -585,8 +586,7 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor) 
		dev_err(&client->dev,

			"pixel array controls initialization failed (%d)\n",

			sensor->pixel_array->ctrl_handler.error);

		rval = sensor->pixel_array->ctrl_handler.error;

		goto error;

		return sensor->pixel_array->ctrl_handler.error;

	}



	sensor->pixel_array->sd.ctrl_handler =
@@ -596,7 +596,8 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor) 


	rval = v4l2_ctrl_handler_init(&sensor->src->ctrl_handler, 0);

	if (rval)

		goto error;

		return rval;



	sensor->src->ctrl_handler.lock = &sensor->mutex;



	for (max = 0; sensor->platform_data->op_sys_clock[max + 1]; max++);
@@ -614,20 +615,12 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor) 
		dev_err(&client->dev,

			"src controls initialization failed (%d)\n",

			sensor->src->ctrl_handler.error);

		rval = sensor->src->ctrl_handler.error;

		goto error;

		return sensor->src->ctrl_handler.error;

	}



	sensor->src->sd.ctrl_handler =

		&sensor->src->ctrl_handler;

	sensor->src->sd.ctrl_handler = &sensor->src->ctrl_handler;



	return 0;



error:

	v4l2_ctrl_handler_free(&sensor->pixel_array->ctrl_handler);

	v4l2_ctrl_handler_free(&sensor->src->ctrl_handler);



	return rval;

}



static void smiapp_free_controls(struct smiapp_sensor *sensor)