On Tue 25 Aug 21:47 CDT 2020, Stephen Boyd wrote:
> 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.
>
> Cc: Jeykumar Sankaran <jsa...@codeaurora.org>
> Cc: Chandan Uddaraju <chand...@codeaurora.org>
> Cc: Vara Reddy <va...@codeaurora.org>
> Cc: Tanmay Shah <tan...@codeaurora.org>
> Cc: Bjorn Andersson <bjorn.anders...@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.anders...@linaro.org>
Regards,
Bjorn
> Cc: Manu Gautam <mgau...@codeaurora.org>
> Cc: Sandeep Maheswaram <s...@codeaurora.org>
> Cc: Douglas Anderson <diand...@chromium.org>
> Cc: Sean Paul <seanp...@chromium.org>
> Cc: Jonathan Marek <jonat...@marek.ca>
> Cc: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
> Cc: Rob Clark <robdcl...@chromium.org>
> Signed-off-by: Stephen Boyd <swb...@chromium.org>
> ---
> drivers/phy/qualcomm/phy-qcom-qmp.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c
> b/drivers/phy/qualcomm/phy-qcom-qmp.c
> index 7ee9e966dc6d..4a23ba9361b3 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
> @@ -1844,7 +1844,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 {
> @@ -1861,7 +1860,6 @@ struct qcom_qmp {
>
> struct mutex phy_mutex;
> int init_count;
> - bool phy_initialized;
>
> struct reset_control *ufs_reset;
> };
> @@ -2748,7 +2746,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:
> @@ -2792,8 +2789,6 @@ static int qcom_qmp_phy_disable(struct phy *phy)
>
> qcom_qmp_phy_com_exit(qmp);
>
> - qmp->phy_initialized = false;
> -
> return 0;
> }
>
> @@ -2868,7 +2863,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;
> }
> @@ -2894,7 +2889,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;
> }
> --
> Sent by a computer, using git, on the internet
>
