Replace manual drm_bridge_remove()/mipi_dsi_detach() in remove with devm_drm_bridge_add() and devm_mipi_dsi_attach() in probe. Also check the return value from bridge registration.
Signed-off-by: Osama Abdelkader <[email protected]> --- drivers/gpu/drm/bridge/tc358764.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358764.c b/drivers/gpu/drm/bridge/tc358764.c index 084e9d898e22..ae652f2eef1b 100644 --- a/drivers/gpu/drm/bridge/tc358764.c +++ b/drivers/gpu/drm/bridge/tc358764.c @@ -372,25 +372,17 @@ static int tc358764_probe(struct mipi_dsi_device *dsi) ctx->bridge.of_node = dev->of_node; ctx->bridge.pre_enable_prev_first = true; - drm_bridge_add(&ctx->bridge); + ret = devm_drm_bridge_add(dev, &ctx->bridge); + if (ret < 0) + return ret; - ret = mipi_dsi_attach(dsi); - if (ret < 0) { - drm_bridge_remove(&ctx->bridge); + ret = devm_mipi_dsi_attach(dev, dsi); + if (ret < 0) dev_err(dev, "failed to attach dsi\n"); - } return ret; } -static void tc358764_remove(struct mipi_dsi_device *dsi) -{ - struct tc358764 *ctx = mipi_dsi_get_drvdata(dsi); - - mipi_dsi_detach(dsi); - drm_bridge_remove(&ctx->bridge); -} - static const struct of_device_id tc358764_of_match[] = { { .compatible = "toshiba,tc358764" }, { } @@ -399,7 +391,6 @@ MODULE_DEVICE_TABLE(of, tc358764_of_match); static struct mipi_dsi_driver tc358764_driver = { .probe = tc358764_probe, - .remove = tc358764_remove, .driver = { .name = "tc358764", .of_match_table = tc358764_of_match, -- 2.43.0
