Commit c3718de5 authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab

[media] media: drop call to v4l2_device_unregister_subdev()

These drivers are moved to support asynchronous probing,
v4l2_async_unregister_subdev() unregisters the subdev so
there isn't a need to explicitly call v4l2_device_unregister_subdev().
Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 1fe0fbd6
...@@ -506,7 +506,6 @@ static int adv7343_remove(struct i2c_client *client) ...@@ -506,7 +506,6 @@ static int adv7343_remove(struct i2c_client *client)
struct adv7343_state *state = to_state(sd); struct adv7343_state *state = to_state(sd);
v4l2_async_unregister_subdev(&state->sd); v4l2_async_unregister_subdev(&state->sd);
v4l2_device_unregister_subdev(sd);
v4l2_ctrl_handler_free(&state->hdl); v4l2_ctrl_handler_free(&state->hdl);
return 0; return 0;
......
...@@ -2888,7 +2888,6 @@ static int adv76xx_remove(struct i2c_client *client) ...@@ -2888,7 +2888,6 @@ static int adv76xx_remove(struct i2c_client *client)
cancel_delayed_work(&state->delayed_work_enable_hotplug); cancel_delayed_work(&state->delayed_work_enable_hotplug);
destroy_workqueue(state->work_queues); destroy_workqueue(state->work_queues);
v4l2_async_unregister_subdev(sd); v4l2_async_unregister_subdev(sd);
v4l2_device_unregister_subdev(sd);
media_entity_cleanup(&sd->entity); media_entity_cleanup(&sd->entity);
adv76xx_unregister_clients(to_state(sd)); adv76xx_unregister_clients(to_state(sd));
v4l2_ctrl_handler_free(sd->ctrl_handler); v4l2_ctrl_handler_free(sd->ctrl_handler);
......
...@@ -1016,7 +1016,6 @@ static int mt9v032_remove(struct i2c_client *client) ...@@ -1016,7 +1016,6 @@ static int mt9v032_remove(struct i2c_client *client)
v4l2_async_unregister_subdev(subdev); v4l2_async_unregister_subdev(subdev);
v4l2_ctrl_handler_free(&mt9v032->ctrls); v4l2_ctrl_handler_free(&mt9v032->ctrls);
v4l2_device_unregister_subdev(subdev);
media_entity_cleanup(&subdev->entity); media_entity_cleanup(&subdev->entity);
return 0; return 0;
......
...@@ -1016,7 +1016,6 @@ static int mt9m111_remove(struct i2c_client *client) ...@@ -1016,7 +1016,6 @@ static int mt9m111_remove(struct i2c_client *client)
v4l2_async_unregister_subdev(&mt9m111->subdev); v4l2_async_unregister_subdev(&mt9m111->subdev);
v4l2_clk_put(mt9m111->clk); v4l2_clk_put(mt9m111->clk);
v4l2_device_unregister_subdev(&mt9m111->subdev);
v4l2_ctrl_handler_free(&mt9m111->hdl); v4l2_ctrl_handler_free(&mt9m111->hdl);
return 0; return 0;
......
...@@ -479,7 +479,6 @@ static int ths8200_remove(struct i2c_client *client) ...@@ -479,7 +479,6 @@ static int ths8200_remove(struct i2c_client *client)
ths8200_s_power(sd, false); ths8200_s_power(sd, false);
v4l2_async_unregister_subdev(&decoder->sd); v4l2_async_unregister_subdev(&decoder->sd);
v4l2_device_unregister_subdev(sd);
return 0; return 0;
} }
......
...@@ -1209,7 +1209,6 @@ static int tvp514x_remove(struct i2c_client *client) ...@@ -1209,7 +1209,6 @@ static int tvp514x_remove(struct i2c_client *client)
struct tvp514x_decoder *decoder = to_decoder(sd); struct tvp514x_decoder *decoder = to_decoder(sd);
v4l2_async_unregister_subdev(&decoder->sd); v4l2_async_unregister_subdev(&decoder->sd);
v4l2_device_unregister_subdev(sd);
#if defined(CONFIG_MEDIA_CONTROLLER) #if defined(CONFIG_MEDIA_CONTROLLER)
media_entity_cleanup(&decoder->sd.entity); media_entity_cleanup(&decoder->sd.entity);
#endif #endif
......
...@@ -1116,7 +1116,6 @@ static int tvp7002_remove(struct i2c_client *c) ...@@ -1116,7 +1116,6 @@ static int tvp7002_remove(struct i2c_client *c)
#if defined(CONFIG_MEDIA_CONTROLLER) #if defined(CONFIG_MEDIA_CONTROLLER)
media_entity_cleanup(&device->sd.entity); media_entity_cleanup(&device->sd.entity);
#endif #endif
v4l2_device_unregister_subdev(sd);
v4l2_ctrl_handler_free(&device->hdl); v4l2_ctrl_handler_free(&device->hdl);
return 0; return 0;
} }
......
...@@ -380,7 +380,6 @@ static int sh_csi2_remove(struct platform_device *pdev) ...@@ -380,7 +380,6 @@ static int sh_csi2_remove(struct platform_device *pdev)
struct sh_csi2 *priv = container_of(subdev, struct sh_csi2, subdev); struct sh_csi2 *priv = container_of(subdev, struct sh_csi2, subdev);
v4l2_async_unregister_subdev(&priv->subdev); v4l2_async_unregister_subdev(&priv->subdev);
v4l2_device_unregister_subdev(subdev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment