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: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c
index d74f254db66185ef96d5c6f6df735f636444352b..efda1aa95ca023d0fde2cb6ac7585444170f9659 100644 (file)
--- a/drivers/media/i2c/mt9m111.c
+++ b/drivers/media/i2c/mt9m111.c
@@ -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);
 

diff --git a/drivers/media/i2c/ov2640.c b/drivers/media/i2c/ov2640.c
index 518868388d65081448fab673d17eeab79a7f050f..4c3b92763243590cfe5d01e46392b3ec17863a53 100644 (file)
--- a/drivers/media/i2c/ov2640.c
+++ b/drivers/media/i2c/ov2640.c
@@ -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;

diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c
index 122dd6c5eb38957b08a1f3eec1af0772f3fe2147..4715edc8ca33e2ef2d73fbf8a6eb32ba5099ae5b 100644 (file)
--- a/drivers/media/i2c/ov2659.c
+++ b/drivers/media/i2c/ov2659.c
@@ -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;

diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
index fd229bc8a0e5bdf30c78f2af2f6e8d2e4b846a26..28571de1c2f6749797123704c0b2a617dc304088 100644 (file)
--- a/drivers/media/i2c/ov7670.c
+++ b/drivers/media/i2c/ov7670.c
@@ -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;
 }

diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c
index 0308ba437bbbc7f9f8a50380766eea2029ec5488..576ce064029739b0223babed845e4937e71a6d3b 100644 (file)
--- a/drivers/media/i2c/ov7740.c
+++ b/drivers/media/i2c/ov7740.c
@@ -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);
 

diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c
index d575b3e7e835efe60c94756f94027e55dd30da41..8b0aa9297bdefb21c666c80620a776d154cf57e2 100644 (file)
--- a/drivers/media/i2c/tvp514x.c
+++ b/drivers/media/i2c/tvp514x.c
@@ -1131,9 +1131,7 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id)
 done:
        if (ret < 0) {
                v4l2_ctrl_handler_free(&decoder->hdl);
-#if defined(CONFIG_MEDIA_CONTROLLER)
                media_entity_cleanup(&decoder->sd.entity);
-#endif
        }
        return ret;
 }
@@ -1151,9 +1149,7 @@ static int tvp514x_remove(struct i2c_client *client)
        struct tvp514x_decoder *decoder = to_decoder(sd);
 
        v4l2_async_unregister_subdev(&decoder->sd);
-#if defined(CONFIG_MEDIA_CONTROLLER)
        media_entity_cleanup(&decoder->sd.entity);
-#endif
        v4l2_ctrl_handler_free(&decoder->hdl);
        return 0;
 }

diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index d7a669058b5e599ea67cb0d486055c61295a68b5..a732af1dbba099d493af5884c293bd923669260a 100644 (file)
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -634,7 +634,11 @@ int media_entity_pads_init(struct media_entity *entity, u16 num_pads,
  * This function must be called during the cleanup phase after unregistering
  * the entity (currently, it does nothing).
  */
-static inline void media_entity_cleanup(struct media_entity *entity) {};
+#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)
+static inline void media_entity_cleanup(struct media_entity *entity) {}
+#else
+#define media_entity_cleanup(entity) do { } while (false)
+#endif
 
 /**
  * media_create_pad_link() - creates a link between two entities.