mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
phy: qcom-qmp: Remove 'initialized' in favor of 'init_count'
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>
This commit is contained in:
parent
dadcf9959c
commit
e4bc7de8ae
1 changed files with 2 additions and 7 deletions
|
@ -1843,7 +1843,6 @@ struct qmp_phy {
|
||||||
* @phys: array of per-lane phy descriptors
|
* @phys: array of per-lane phy descriptors
|
||||||
* @phy_mutex: mutex lock for PHY common block initialization
|
* @phy_mutex: mutex lock for PHY common block initialization
|
||||||
* @init_count: phy common block initialization count
|
* @init_count: phy common block initialization count
|
||||||
* @phy_initialized: indicate if PHY has been initialized
|
|
||||||
* @ufs_reset: optional UFS PHY reset handle
|
* @ufs_reset: optional UFS PHY reset handle
|
||||||
*/
|
*/
|
||||||
struct qcom_qmp {
|
struct qcom_qmp {
|
||||||
|
@ -1860,7 +1859,6 @@ struct qcom_qmp {
|
||||||
|
|
||||||
struct mutex phy_mutex;
|
struct mutex phy_mutex;
|
||||||
int init_count;
|
int init_count;
|
||||||
bool phy_initialized;
|
|
||||||
|
|
||||||
struct reset_control *ufs_reset;
|
struct reset_control *ufs_reset;
|
||||||
};
|
};
|
||||||
|
@ -2750,7 +2748,6 @@ static int qcom_qmp_phy_enable(struct phy *phy)
|
||||||
dev_err(qmp->dev, "phy initialization timed-out\n");
|
dev_err(qmp->dev, "phy initialization timed-out\n");
|
||||||
goto err_pcs_ready;
|
goto err_pcs_ready;
|
||||||
}
|
}
|
||||||
qmp->phy_initialized = true;
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_pcs_ready:
|
err_pcs_ready:
|
||||||
|
@ -2794,8 +2791,6 @@ static int qcom_qmp_phy_disable(struct phy *phy)
|
||||||
|
|
||||||
qcom_qmp_phy_com_exit(qmp);
|
qcom_qmp_phy_com_exit(qmp);
|
||||||
|
|
||||||
qmp->phy_initialized = false;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2870,7 +2865,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_suspend(struct device *dev)
|
||||||
if (cfg->type != PHY_TYPE_USB3)
|
if (cfg->type != PHY_TYPE_USB3)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!qmp->phy_initialized) {
|
if (!qmp->init_count) {
|
||||||
dev_vdbg(dev, "PHY not initialized, bailing out\n");
|
dev_vdbg(dev, "PHY not initialized, bailing out\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -2896,7 +2891,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_resume(struct device *dev)
|
||||||
if (cfg->type != PHY_TYPE_USB3)
|
if (cfg->type != PHY_TYPE_USB3)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!qmp->phy_initialized) {
|
if (!qmp->init_count) {
|
||||||
dev_vdbg(dev, "PHY not initialized, bailing out\n");
|
dev_vdbg(dev, "PHY not initialized, bailing out\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue