Skip to content

Commit

Permalink
phy: qcom-qmp: Remove 'initialized' in favor of 'init_count'
Browse files Browse the repository at this point in the history
We already track if any phy inside the qmp wrapper has been initialized
by means of the struct qcom_qmp::init_count member. Let's drop the
duplicate 'initialized' member to simplify the code a bit.

Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Jeykumar Sankaran <jsanka@codeaurora.org>
Cc: Chandan Uddaraju <chandanu@codeaurora.org>
Cc: Vara Reddy <varar@codeaurora.org>
Cc: Tanmay Shah <tanmay@codeaurora.org>
Cc: Manu Gautam <mgautam@codeaurora.org>
Cc: Sandeep Maheswaram <sanm@codeaurora.org>
Cc: Douglas Anderson <dianders@chromium.org>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Jonathan Marek <jonathan@marek.ca>
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Rob Clark <robdclark@chromium.org>
Link: https://lore.kernel.org/r/20200916231202.3637932-4-swboyd@chromium.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
  • Loading branch information
Stephen Boyd authored and Vinod Koul committed Sep 28, 2020
1 parent dadcf99 commit e4bc7de
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/phy/qualcomm/phy-qcom-qmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1843,7 +1843,6 @@ struct qmp_phy {
* @phys: array of per-lane phy descriptors
* @phy_mutex: mutex lock for PHY common block initialization
* @init_count: phy common block initialization count
* @phy_initialized: indicate if PHY has been initialized
* @ufs_reset: optional UFS PHY reset handle
*/
struct qcom_qmp {
Expand All @@ -1860,7 +1859,6 @@ struct qcom_qmp {

struct mutex phy_mutex;
int init_count;
bool phy_initialized;

struct reset_control *ufs_reset;
};
Expand Down Expand Up @@ -2750,7 +2748,6 @@ static int qcom_qmp_phy_enable(struct phy *phy)
dev_err(qmp->dev, "phy initialization timed-out\n");
goto err_pcs_ready;
}
qmp->phy_initialized = true;
return 0;

err_pcs_ready:
Expand Down Expand Up @@ -2794,8 +2791,6 @@ static int qcom_qmp_phy_disable(struct phy *phy)

qcom_qmp_phy_com_exit(qmp);

qmp->phy_initialized = false;

return 0;
}

Expand Down Expand Up @@ -2870,7 +2865,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_suspend(struct device *dev)
if (cfg->type != PHY_TYPE_USB3)
return 0;

if (!qmp->phy_initialized) {
if (!qmp->init_count) {
dev_vdbg(dev, "PHY not initialized, bailing out\n");
return 0;
}
Expand All @@ -2896,7 +2891,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_resume(struct device *dev)
if (cfg->type != PHY_TYPE_USB3)
return 0;

if (!qmp->phy_initialized) {
if (!qmp->init_count) {
dev_vdbg(dev, "PHY not initialized, bailing out\n");
return 0;
}
Expand Down

0 comments on commit e4bc7de

Please sign in to comment.