vout: fix failure problem of vout while startup

fix failure problem of vout while startup

Signed-off-by: shengyang.chen<shengyang.chen@starfivetech.com>

diff --git a/drivers/gpu/drm/verisilicon/inno_hdmi.c b/drivers/gpu/drm/verisilicon/inno_hdmi.c
index 08c06be..8e46de4 100755 (executable)
--- a/drivers/gpu/drm/verisilicon/inno_hdmi.c
+++ b/drivers/gpu/drm/verisilicon/inno_hdmi.c
@@ -1395,7 +1395,6 @@ static void inno_hdmi_get_edid(struct inno_hdmi *hdmi, unsigned int tmds_clk, un
 
 static int inno_hdmi_get_clk_rst(struct device *dev, struct inno_hdmi *hdmi)
 {
-       int ret;
        hdmi->sys_clk = devm_clk_get(dev, "sysclk");
        if (IS_ERR(hdmi->sys_clk)) {
                DRM_DEV_ERROR(dev, "Unable to get HDMI sysclk clk\n");
@@ -1416,7 +1415,7 @@ static int inno_hdmi_get_clk_rst(struct device *dev, struct inno_hdmi *hdmi)
                DRM_DEV_ERROR(dev, "Unable to get HDMI tx rst\n");
                return PTR_ERR(hdmi->tx_rst);
        }
-       return ret;
+       return 0;
 }
 
 static int inno_hdmi_en_clk_deas_rst(struct device *dev, struct inno_hdmi *hdmi)

diff --git a/drivers/gpu/drm/verisilicon/starfive_drm_dsi.c b/drivers/gpu/drm/verisilicon/starfive_drm_dsi.c
index 9f7dcd6..775b391 100644 (file)
--- a/drivers/gpu/drm/verisilicon/starfive_drm_dsi.c
+++ b/drivers/gpu/drm/verisilicon/starfive_drm_dsi.c
@@ -593,8 +593,6 @@ static int cdns_dsi_resets_assert(struct cdns_dsi *dsi, struct device *dev)
 //get clock func
 static int cdns_dsi_get_clock(struct device *dev, struct cdns_dsi *dsi)
 {
-       int ret;
-
        dsi->dsi_sys_clk = devm_clk_get(dev, "sys");
        if (IS_ERR(dsi->dsi_sys_clk)){
                dev_err(dev, "failed to get dsi_sys_clk\n");
@@ -619,14 +617,12 @@ static int cdns_dsi_get_clock(struct device *dev, struct cdns_dsi *dsi)
                return PTR_ERR(dsi->dpi_clk);
        }
 
-       return ret;
+       return 0;
 }
 
 //get reset func
 static int cdns_dsi_get_reset(struct device *dev, struct cdns_dsi *dsi)
 {
-       int ret;
-
        dsi->dpi_rst = reset_control_get_exclusive(dev, "dsi_dpi");
        if (IS_ERR(dsi->dpi_rst)){
                dev_err(dev, "failed to get dpi_rst\n");
@@ -663,7 +659,7 @@ static int cdns_dsi_get_reset(struct device *dev, struct cdns_dsi *dsi)
                return PTR_ERR(dsi->txesc_rst);
        }
 
-       return ret;
+       return 0;
 }
 
 static inline struct cdns_dsi *input_to_dsi(struct cdns_dsi_input *input)

diff --git a/drivers/gpu/drm/verisilicon/vs_dc.c b/drivers/gpu/drm/verisilicon/vs_dc.c
index 1b68bf1..055e29c 100755 (executable)
--- a/drivers/gpu/drm/verisilicon/vs_dc.c
+++ b/drivers/gpu/drm/verisilicon/vs_dc.c
@@ -309,7 +309,6 @@ static void plda_clk_rst_deinit(struct device *dev)
 
 static int vs_dc_get_clock(struct device *dev, struct vs_dc *dc)
 {
-       int ret;
        dc->cpu_axi = devm_clk_get(dev, "noc_cpu");
        if (IS_ERR(dc->cpu_axi)) {
                dev_err(dev, "---cpu_axi get error\n");
@@ -333,7 +332,7 @@ static int vs_dc_get_clock(struct device *dev, struct vs_dc *dc)
                dev_err(dev, "---stg_axi get error\n");
                return PTR_ERR(dc->stg_axi);
        }
-       return ret;
+       return 0;
 }
 
 static int  vs_dc_clock_enable(struct device *dev, struct vs_dc *dc)
@@ -374,8 +373,6 @@ static void  vs_dc_clock_disable(struct vs_dc *dc)
 
 static int vs_dc_vouttop_get_clock(struct device *dev, struct vs_dc *dc)
 {
-       int ret;
-
        dc->vout_src = devm_clk_get(dev, "vout_src");
        if (IS_ERR(dc->vout_src)) {
                dev_err(dev, "failed to get vout_src\n");
@@ -412,7 +409,7 @@ static int vs_dc_vouttop_get_clock(struct device *dev, struct vs_dc *dc)
                return PTR_ERR(dc->bclk_mst);
        }
 
-       return ret;
+       return 0;
 }
 
 static int  vs_dc_vouttop_clock_enable(struct device *dev, struct vs_dc *dc)
@@ -458,7 +455,6 @@ static void  vs_dc_vouttop_clock_disable(struct vs_dc *dc)
 
 static int vs_dc_dc8200_get_clock(struct device *dev, struct vs_dc *dc)
 {
-       int ret;
        dc->dc8200_clk_pix0 = devm_clk_get(dev, "pix_clk");
        if (IS_ERR(dc->dc8200_clk_pix0)) {
                dev_err(dev, "---dc8200_clk_pix0 get error\n");
@@ -488,7 +484,7 @@ static int vs_dc_dc8200_get_clock(struct device *dev, struct vs_dc *dc)
                dev_err(dev, "---dc8200_ahb get error\n");
                return PTR_ERR(dc->dc8200_ahb);
        }
-       return ret;
+       return 0;
 }
 
 static int  vs_dc_dc8200_clock_enable(struct device *dev, struct vs_dc *dc)

diff --git a/drivers/phy/m31/phy-m31-dphy-tx0.c b/drivers/phy/m31/phy-m31-dphy-tx0.c
index 76bd1fa..bde1fa8 100644 (file)
--- a/drivers/phy/m31/phy-m31-dphy-tx0.c
+++ b/drivers/phy/m31/phy-m31-dphy-tx0.c
@@ -152,8 +152,6 @@ struct sf_dphy {
 
 static int sf_dphy_clkrst_get(struct device *dev, struct sf_dphy *dphy)
 {
-       int ret;
-
        dphy->txesc_clk = devm_clk_get(dev, "dphy_txesc");
        if (IS_ERR(dphy->txesc_clk)){
                dev_err(dev, "===txesc_clk get error\n");
@@ -165,7 +163,7 @@ static int sf_dphy_clkrst_get(struct device *dev, struct sf_dphy *dphy)
                return PTR_ERR(dphy->sys_rst);
        }
 
-       return ret;
+       return 0;
 }
 static int sf_dphy_clkrst_ena_deas(struct device *dev, struct sf_dphy *dphy)
 {