Commit 3580112b authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

media: entity: Add a nop variant of media_entity_cleanup 



Add nop variant of media_entity_cleanup. This allows calling
media_entity_cleanup whether or not Media controller is enabled,
simplifying driver code.

Also drop #ifdefs on a few drivers around media_entity_cleanup().

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 6146fde3

drivers/media/i2c/mt9m111.c

+0 −2
Original line number Diff line number Diff line
@@ -1046,9 +1046,7 @@ static int mt9m111_remove(struct i2c_client *client) 
	struct mt9m111 *mt9m111 = to_mt9m111(client);



	v4l2_async_unregister_subdev(&mt9m111->subdev);

#ifdef CONFIG_MEDIA_CONTROLLER

	media_entity_cleanup(&mt9m111->subdev.entity);

#endif

	v4l2_clk_put(mt9m111->clk);

	v4l2_ctrl_handler_free(&mt9m111->hdl);

drivers/media/i2c/ov2640.c

+0 −4
Original line number Diff line number Diff line
@@ -1147,9 +1147,7 @@ static int ov2640_probe(struct i2c_client *client, 
	return 0;



err_videoprobe:

#if defined(CONFIG_MEDIA_CONTROLLER)

	media_entity_cleanup(&priv->subdev.entity);

#endif

err_hdl:

	v4l2_ctrl_handler_free(&priv->hdl);

err_clk:
@@ -1163,9 +1161,7 @@ static int ov2640_remove(struct i2c_client *client) 


	v4l2_async_unregister_subdev(&priv->subdev);

	v4l2_ctrl_handler_free(&priv->hdl);

#if defined(CONFIG_MEDIA_CONTROLLER)

	media_entity_cleanup(&priv->subdev.entity);

#endif

	v4l2_device_unregister_subdev(&priv->subdev);

	clk_disable_unprepare(priv->clk);

	return 0;

drivers/media/i2c/ov2659.c

+0 −4
Original line number Diff line number Diff line
@@ -1474,9 +1474,7 @@ static int ov2659_probe(struct i2c_client *client, 


error:

	v4l2_ctrl_handler_free(&ov2659->ctrls);

#if defined(CONFIG_MEDIA_CONTROLLER)

	media_entity_cleanup(&sd->entity);

#endif

	mutex_destroy(&ov2659->lock);

	return ret;

}
@@ -1488,9 +1486,7 @@ static int ov2659_remove(struct i2c_client *client) 


	v4l2_ctrl_handler_free(&ov2659->ctrls);

	v4l2_async_unregister_subdev(sd);

#if defined(CONFIG_MEDIA_CONTROLLER)

	media_entity_cleanup(&sd->entity);

#endif

	mutex_destroy(&ov2659->lock);



	return 0;

drivers/media/i2c/ov7670.c

+0 −4
Original line number Diff line number Diff line
@@ -1846,9 +1846,7 @@ static int ov7670_probe(struct i2c_client *client, 
	return 0;



entity_cleanup:

#if defined(CONFIG_MEDIA_CONTROLLER)

	media_entity_cleanup(&info->sd.entity);

#endif

hdl_free:

	v4l2_ctrl_handler_free(&info->hdl);

power_off:
@@ -1867,9 +1865,7 @@ static int ov7670_remove(struct i2c_client *client) 
	v4l2_async_unregister_subdev(sd);

	v4l2_ctrl_handler_free(&info->hdl);

	clk_disable_unprepare(info->clk);

#if defined(CONFIG_MEDIA_CONTROLLER)

	media_entity_cleanup(&info->sd.entity);

#endif

	ov7670_s_power(sd, 0);

	return 0;

}

drivers/media/i2c/ov7740.c

+0 −2
Original line number Diff line number Diff line
@@ -1148,9 +1148,7 @@ static int ov7740_remove(struct i2c_client *client) 


	mutex_destroy(&ov7740->mutex);

	v4l2_ctrl_handler_free(ov7740->subdev.ctrl_handler);

#if defined(CONFIG_MEDIA_CONTROLLER)

	media_entity_cleanup(&ov7740->subdev.entity);

#endif

	v4l2_async_unregister_subdev(sd);

	ov7740_free_controls(ov7740);

CRA Git | Maintained and supported by SUSTech CRA and CCSE