mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 02:23:16 +00:00
drm/msm/dsi: One function call less in dsi_init() after error detection
The dsi_destroy() function was called in two cases by the dsi_init() function during error handling even if the passed variable contained a null pointer. * This implementation detail could be improved by adjustments for jump targets according to the Linux coding style convention. * Drop an unnecessary initialisation for the variable "msm_dsi" then. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> [add couple missing ERR_PTR()'s] Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
parent
a60bbb2764
commit
da882cd1ee
@ -74,19 +74,15 @@ static void dsi_destroy(struct msm_dsi *msm_dsi)
|
||||
|
||||
static struct msm_dsi *dsi_init(struct platform_device *pdev)
|
||||
{
|
||||
struct msm_dsi *msm_dsi = NULL;
|
||||
struct msm_dsi *msm_dsi;
|
||||
int ret;
|
||||
|
||||
if (!pdev) {
|
||||
ret = -ENXIO;
|
||||
goto fail;
|
||||
}
|
||||
if (!pdev)
|
||||
return ERR_PTR(-ENXIO);
|
||||
|
||||
msm_dsi = devm_kzalloc(&pdev->dev, sizeof(*msm_dsi), GFP_KERNEL);
|
||||
if (!msm_dsi) {
|
||||
ret = -ENOMEM;
|
||||
goto fail;
|
||||
}
|
||||
if (!msm_dsi)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
DBG("dsi probed=%p", msm_dsi);
|
||||
|
||||
msm_dsi->pdev = pdev;
|
||||
@ -95,21 +91,21 @@ static struct msm_dsi *dsi_init(struct platform_device *pdev)
|
||||
/* Init dsi host */
|
||||
ret = msm_dsi_host_init(msm_dsi);
|
||||
if (ret)
|
||||
goto fail;
|
||||
goto destroy_dsi;
|
||||
|
||||
/* GET dsi PHY */
|
||||
ret = dsi_get_phy(msm_dsi);
|
||||
if (ret)
|
||||
goto fail;
|
||||
goto destroy_dsi;
|
||||
|
||||
/* Register to dsi manager */
|
||||
ret = msm_dsi_manager_register(msm_dsi);
|
||||
if (ret)
|
||||
goto fail;
|
||||
goto destroy_dsi;
|
||||
|
||||
return msm_dsi;
|
||||
|
||||
fail:
|
||||
destroy_dsi:
|
||||
dsi_destroy(msm_dsi);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user