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

Commit 4eee7914 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mauro Carvalho Chehab
Browse files

media: staging: atomisp: Remove unused members of camera_sensor_platform_data 



Remove unused members along with dead code.

Mostly done with help of coccinelle.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent a760bca5

drivers/staging/media/atomisp/i2c/atomisp-gc0310.c

+0 −13
Original line number Diff line number Diff line
@@ -1156,13 +1156,6 @@ static int gc0310_s_config(struct v4l2_subdev *sd, 
		(struct camera_sensor_platform_data *)platform_data;



	mutex_lock(&dev->input_lock);

	if (dev->platform_data->platform_init) {

		ret = dev->platform_data->platform_init(client);

		if (ret) {

			dev_err(&client->dev, "platform init err\n");

			goto platform_init_failed;

		}

	}

	/* power off the module, then power on it in future

	 * as first power on by board may not fulfill the

	 * power on sequqence needed by the module
@@ -1207,9 +1200,6 @@ static int gc0310_s_config(struct v4l2_subdev *sd, 
	power_down(sd);

	dev_err(&client->dev, "sensor power-gating failed\n");

fail_power_off:

	if (dev->platform_data->platform_deinit)

		dev->platform_data->platform_deinit();

platform_init_failed:

	mutex_unlock(&dev->input_lock);

	return ret;

}
@@ -1353,9 +1343,6 @@ static int gc0310_remove(struct i2c_client *client) 
	struct gc0310_device *dev = to_gc0310_sensor(sd);

	dev_dbg(&client->dev, "gc0310_remove...\n");



	if (dev->platform_data->platform_deinit)

		dev->platform_data->platform_deinit();



	dev->platform_data->csi_cfg(sd, 0);



	v4l2_device_unregister_subdev(sd);

drivers/staging/media/atomisp/i2c/atomisp-gc2235.c

+0 −13
Original line number Diff line number Diff line
@@ -897,13 +897,6 @@ static int gc2235_s_config(struct v4l2_subdev *sd, 
		(struct camera_sensor_platform_data *)platform_data;



	mutex_lock(&dev->input_lock);

	if (dev->platform_data->platform_init) {

		ret = dev->platform_data->platform_init(client);

		if (ret) {

			dev_err(&client->dev, "platform init err\n");

			goto platform_init_failed;

		}

	}

	/* power off the module, then power on it in future

	 * as first power on by board may not fulfill the

	 * power on sequqence needed by the module
@@ -947,9 +940,6 @@ static int gc2235_s_config(struct v4l2_subdev *sd, 
	power_down(sd);

	dev_err(&client->dev, "sensor power-gating failed\n");

fail_power_off:

	if (dev->platform_data->platform_deinit)

		dev->platform_data->platform_deinit();

platform_init_failed:

	mutex_unlock(&dev->input_lock);

	return ret;

}
@@ -1092,9 +1082,6 @@ static int gc2235_remove(struct i2c_client *client) 
	struct gc2235_device *dev = to_gc2235_sensor(sd);

	dev_dbg(&client->dev, "gc2235_remove...\n");



	if (dev->platform_data->platform_deinit)

		dev->platform_data->platform_deinit();



	dev->platform_data->csi_cfg(sd, 0);



	v4l2_device_unregister_subdev(sd);

drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c

+0 −9
Original line number Diff line number Diff line
@@ -1575,13 +1575,6 @@ mt9m114_s_config(struct v4l2_subdev *sd, int irq, void *platform_data) 
	dev->platform_data =

	    (struct camera_sensor_platform_data *)platform_data;



	if (dev->platform_data->platform_init) {

		ret = dev->platform_data->platform_init(client);

		if (ret) {

			v4l2_err(client, "mt9m114 platform init err\n");

			return ret;

		}

	}

	ret = power_up(sd);

	if (ret) {

		v4l2_err(client, "mt9m114 power-up err");
@@ -1835,8 +1828,6 @@ static int mt9m114_remove(struct i2c_client *client) 


	dev = container_of(sd, struct mt9m114_device, sd);

	dev->platform_data->csi_cfg(sd, 0);

	if (dev->platform_data->platform_deinit)

		dev->platform_data->platform_deinit();

	v4l2_device_unregister_subdev(sd);

	media_entity_cleanup(&dev->sd.entity);

	v4l2_ctrl_handler_free(&dev->ctrl_handler);

drivers/staging/media/atomisp/i2c/atomisp-ov2722.c

+0 −13
Original line number Diff line number Diff line
@@ -1035,13 +1035,6 @@ static int ov2722_s_config(struct v4l2_subdev *sd, 
		(struct camera_sensor_platform_data *)platform_data;



	mutex_lock(&dev->input_lock);

	if (dev->platform_data->platform_init) {

		ret = dev->platform_data->platform_init(client);

		if (ret) {

			dev_err(&client->dev, "platform init err\n");

			goto platform_init_failed;

		}

	}



	/* power off the module, then power on it in future

	 * as first power on by board may not fulfill the
@@ -1086,9 +1079,6 @@ static int ov2722_s_config(struct v4l2_subdev *sd, 
	power_down(sd);

	dev_err(&client->dev, "sensor power-gating failed\n");

fail_power_off:

	if (dev->platform_data->platform_deinit)

		dev->platform_data->platform_deinit();

platform_init_failed:

	mutex_unlock(&dev->input_lock);

	return ret;

}
@@ -1232,9 +1222,6 @@ static int ov2722_remove(struct i2c_client *client) 
	struct ov2722_device *dev = to_ov2722_sensor(sd);

	dev_dbg(&client->dev, "ov2722_remove...\n");



	if (dev->platform_data->platform_deinit)

		dev->platform_data->platform_deinit();



	dev->platform_data->csi_cfg(sd, 0);

	v4l2_ctrl_handler_free(&dev->ctrl_handler);

	v4l2_device_unregister_subdev(sd);

drivers/staging/media/atomisp/i2c/ov8858.c

+0 −13
Original line number Diff line number Diff line
@@ -1565,15 +1565,6 @@ static int ov8858_s_config(struct v4l2_subdev *sd, 


	mutex_lock(&dev->input_lock);



	if (dev->platform_data->platform_init) {

		ret = dev->platform_data->platform_init(client);

		if (ret) {

			mutex_unlock(&dev->input_lock);

			dev_err(&client->dev, "platform init error %d!\n", ret);

			return ret;

		}

	}



	ret = __ov8858_s_power(sd, 1);

	if (ret) {

		dev_err(&client->dev, "power-up error %d!\n", ret);
@@ -1618,8 +1609,6 @@ static int ov8858_s_config(struct v4l2_subdev *sd, 
fail_csi_cfg:

	__ov8858_s_power(sd, 0);

fail_update:

	if (dev->platform_data->platform_deinit)

		dev->platform_data->platform_deinit();

	mutex_unlock(&dev->input_lock);

	dev_err(&client->dev, "sensor power-gating failed\n");

	return ret;
@@ -1920,8 +1909,6 @@ static int ov8858_remove(struct i2c_client *client) 
{

	struct v4l2_subdev *sd = i2c_get_clientdata(client);

	struct ov8858_device *dev = to_ov8858_sensor(sd);

	if (dev->platform_data->platform_deinit)

		dev->platform_data->platform_deinit();



	media_entity_cleanup(&dev->sd.entity);

	v4l2_ctrl_handler_free(&dev->ctrl_handler);