Skip to content

Commit

Permalink
drm/msm/dsi: Return void from msm_dsi_phy_disable()
Browse files Browse the repository at this point in the history
We are not checking the return value from msm_dsi_phy_disable().
Change the return type to void.

Signed-off-by: Hai Li <hali@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
  • Loading branch information
Hai Li authored and Rob Clark committed Aug 15, 2015
1 parent fae11c1 commit 29e6169
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/msm/dsi/dsi.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ void msm_dsi_phy_driver_register(void);
void msm_dsi_phy_driver_unregister(void);
int msm_dsi_phy_enable(struct msm_dsi_phy *phy, int src_pll_id,
const unsigned long bit_rate, const unsigned long esc_rate);
int msm_dsi_phy_disable(struct msm_dsi_phy *phy);
void msm_dsi_phy_disable(struct msm_dsi_phy *phy);
void msm_dsi_phy_get_clk_pre_post(struct msm_dsi_phy *phy,
u32 *clk_pre, u32 *clk_post);
struct msm_dsi_pll *msm_dsi_phy_get_pll(struct msm_dsi_phy *phy);
Expand Down
16 changes: 5 additions & 11 deletions drivers/gpu/drm/msm/dsi/dsi_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
struct dsi_phy_ops {
int (*enable)(struct msm_dsi_phy *phy, int src_pll_id,
const unsigned long bit_rate, const unsigned long esc_rate);
int (*disable)(struct msm_dsi_phy *phy);
void (*disable)(struct msm_dsi_phy *phy);
};

struct dsi_phy_cfg {
Expand Down Expand Up @@ -399,7 +399,7 @@ static int dsi_28nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id,
return 0;
}

static int dsi_28nm_phy_disable(struct msm_dsi_phy *phy)
static void dsi_28nm_phy_disable(struct msm_dsi_phy *phy)
{
dsi_phy_write(phy->base + REG_DSI_28nm_PHY_CTRL_0, 0);
dsi_28nm_phy_regulator_ctrl(phy, false);
Expand All @@ -409,8 +409,6 @@ static int dsi_28nm_phy_disable(struct msm_dsi_phy *phy)
* ensure that the phy is completely disabled
*/
wmb();

return 0;
}

static void dsi_20nm_phy_regulator_ctrl(struct msm_dsi_phy *phy, bool enable)
Expand Down Expand Up @@ -515,12 +513,10 @@ static int dsi_20nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id,
return 0;
}

static int dsi_20nm_phy_disable(struct msm_dsi_phy *phy)
static void dsi_20nm_phy_disable(struct msm_dsi_phy *phy)
{
dsi_phy_write(phy->base + REG_DSI_20nm_PHY_CTRL_0, 0);
dsi_20nm_phy_regulator_ctrl(phy, false);

return 0;
}

static int dsi_phy_enable_resource(struct msm_dsi_phy *phy)
Expand Down Expand Up @@ -730,15 +726,13 @@ int msm_dsi_phy_enable(struct msm_dsi_phy *phy, int src_pll_id,
return phy->cfg->ops.enable(phy, src_pll_id, bit_rate, esc_rate);
}

int msm_dsi_phy_disable(struct msm_dsi_phy *phy)
void msm_dsi_phy_disable(struct msm_dsi_phy *phy)
{
if (!phy || !phy->cfg->ops.disable)
return -EINVAL;
return;

phy->cfg->ops.disable(phy);
dsi_phy_regulator_disable(phy);

return 0;
}

void msm_dsi_phy_get_clk_pre_post(struct msm_dsi_phy *phy,
Expand Down

0 comments on commit 29e6169

Please sign in to comment.