Message ID | 20231204185719.569021-3-macroalpha82@gmail.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
Series | rockchip: Add Powkiddy X55 | expand |
On 04/12/2023 19:57, Chris Morgan wrote: > From: Chris Morgan <macromorgan@hotmail.com> > > The driver shutdown is duplicate as it calls drm_unprepare and > drm_disable which are called anyway when associated drivers are > shutdown/removed. > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com> > --- > drivers/gpu/drm/panel/panel-himax-hx8394.c | 17 ----------------- > 1 file changed, 17 deletions(-) > > diff --git a/drivers/gpu/drm/panel/panel-himax-hx8394.c b/drivers/gpu/drm/panel/panel-himax-hx8394.c > index 3823ff388b96..d8e590d5e1da 100644 > --- a/drivers/gpu/drm/panel/panel-himax-hx8394.c > +++ b/drivers/gpu/drm/panel/panel-himax-hx8394.c > @@ -390,27 +390,11 @@ static int hx8394_probe(struct mipi_dsi_device *dsi) > return 0; > } > > -static void hx8394_shutdown(struct mipi_dsi_device *dsi) > -{ > - struct hx8394 *ctx = mipi_dsi_get_drvdata(dsi); > - int ret; > - > - ret = drm_panel_disable(&ctx->panel); > - if (ret < 0) > - dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret); > - > - ret = drm_panel_unprepare(&ctx->panel); > - if (ret < 0) > - dev_err(&dsi->dev, "Failed to unprepare panel: %d\n", ret); > -} > - > static void hx8394_remove(struct mipi_dsi_device *dsi) > { > struct hx8394 *ctx = mipi_dsi_get_drvdata(dsi); > int ret; > > - hx8394_shutdown(dsi); > - > ret = mipi_dsi_detach(dsi); > if (ret < 0) > dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); > @@ -427,7 +411,6 @@ MODULE_DEVICE_TABLE(of, hx8394_of_match); > static struct mipi_dsi_driver hx8394_driver = { > .probe = hx8394_probe, > .remove = hx8394_remove, > - .shutdown = hx8394_shutdown, > .driver = { > .name = DRV_NAME, > .of_match_table = hx8394_of_match, Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/drivers/gpu/drm/panel/panel-himax-hx8394.c b/drivers/gpu/drm/panel/panel-himax-hx8394.c index 3823ff388b96..d8e590d5e1da 100644 --- a/drivers/gpu/drm/panel/panel-himax-hx8394.c +++ b/drivers/gpu/drm/panel/panel-himax-hx8394.c @@ -390,27 +390,11 @@ static int hx8394_probe(struct mipi_dsi_device *dsi) return 0; } -static void hx8394_shutdown(struct mipi_dsi_device *dsi) -{ - struct hx8394 *ctx = mipi_dsi_get_drvdata(dsi); - int ret; - - ret = drm_panel_disable(&ctx->panel); - if (ret < 0) - dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret); - - ret = drm_panel_unprepare(&ctx->panel); - if (ret < 0) - dev_err(&dsi->dev, "Failed to unprepare panel: %d\n", ret); -} - static void hx8394_remove(struct mipi_dsi_device *dsi) { struct hx8394 *ctx = mipi_dsi_get_drvdata(dsi); int ret; - hx8394_shutdown(dsi); - ret = mipi_dsi_detach(dsi); if (ret < 0) dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); @@ -427,7 +411,6 @@ MODULE_DEVICE_TABLE(of, hx8394_of_match); static struct mipi_dsi_driver hx8394_driver = { .probe = hx8394_probe, .remove = hx8394_remove, - .shutdown = hx8394_shutdown, .driver = { .name = DRV_NAME, .of_match_table = hx8394_of_match,