Skip to content

Commit b354498

Browse files
tchebbmmind
authored andcommitted
drm/rockchip: dsi: remove extra component_del() call
commit cf6d100 ("drm/rockchip: dsi: add dual mipi support") added this devcnt field and call to component_del(). However, these both appear to be erroneous changes left over from an earlier version of the patch. In the version merged, nothing ever modifies devcnt, meaning component_del() runs unconditionally and in addition to the component_del() calls in dw_mipi_dsi_rockchip_host_detach(). The second call fails to delete anything and produces a warning in dmesg. If we look at the previous version of the patch[1], however, we see that it had logic to calculate devcnt and call component_add() in certain situations. This was removed in v6, and the fact that the deletion code was not appears to have been an oversight. [1] https://patchwork.kernel.org/project/dri-devel/patch/[email protected]/ Fixes: cf6d100 ("drm/rockchip: dsi: add dual mipi support") Cc: [email protected] Signed-off-by: Thomas Hebb <[email protected]> Signed-off-by: Heiko Stuebner <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/201385acb0eeb5dfb037afdc6a94bfbcdab97f99.1618797778.git.tommyhebb@gmail.com
1 parent 43c2de1 commit b354498

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,6 @@ struct dw_mipi_dsi_rockchip {
243243
struct dw_mipi_dsi *dmd;
244244
const struct rockchip_dw_dsi_chip_data *cdata;
245245
struct dw_mipi_dsi_plat_data pdata;
246-
int devcnt;
247246
};
248247

249248
struct dphy_pll_parameter_map {
@@ -1141,9 +1140,6 @@ static int dw_mipi_dsi_rockchip_remove(struct platform_device *pdev)
11411140
{
11421141
struct dw_mipi_dsi_rockchip *dsi = platform_get_drvdata(pdev);
11431142

1144-
if (dsi->devcnt == 0)
1145-
component_del(dsi->dev, &dw_mipi_dsi_rockchip_ops);
1146-
11471143
dw_mipi_dsi_remove(dsi->dmd);
11481144

11491145
return 0;

0 commit comments

Comments
 (0)