From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rajendra Nayak Subject: Re: [PATCH] soc: qcom: rpmpd: Drop family A RPM dependency Date: Thu, 17 Jan 2019 15:37:26 +0530 Message-ID: References: <20190117051120.31913-1-bjorn.andersson@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20190117051120.31913-1-bjorn.andersson@linaro.org> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: Bjorn Andersson , Andy Gross , David Brown Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org On 1/17/2019 10:41 AM, Bjorn Andersson wrote: > The MFD_QCOM_RPM is the RPM in family A, but the rpmpd driver only implements > support for SMD based devices. Drop the dependency and remove includes of the > family A headers. No functional change. > > Signed-off-by: Bjorn Andersson > --- > > Sorry for not spotting this earlier, let's apply the series and this fix on > top. Thanks Bjorn for catching this, Reviewed-by: Rajendra Nayak > > drivers/soc/qcom/Kconfig | 2 +- > drivers/soc/qcom/rpmpd.c | 10 ++++------ > 2 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig > index 6241d3e3b115..a5d5167c3f16 100644 > --- a/drivers/soc/qcom/Kconfig > +++ b/drivers/soc/qcom/Kconfig > @@ -109,7 +109,7 @@ config QCOM_RPMHPD > > config QCOM_RPMPD > bool "Qualcomm RPM Power domain driver" > - depends on MFD_QCOM_RPM && QCOM_SMD_RPM > + depends on QCOM_SMD_RPM > help > QCOM RPM Power domain driver to support power-domains with > performance states. The driver communicates a performance state > diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c > index 35a711017d6f..005326050c23 100644 > --- a/drivers/soc/qcom/rpmpd.c > +++ b/drivers/soc/qcom/rpmpd.c > @@ -6,14 +6,12 @@ > #include > #include > #include > -#include > #include > #include > #include > #include > #include > > -#include > #include > > #define domain_to_rpmpd(domain) container_of(domain, struct rpmpd, pd) > @@ -131,8 +129,8 @@ static int rpmpd_send_enable(struct rpmpd *pd, bool enable) > .value = cpu_to_le32(enable), > }; > > - return qcom_rpm_smd_write(pd->rpm, QCOM_RPM_ACTIVE_STATE, pd->res_type, > - pd->res_id, &req, sizeof(req)); > + return qcom_rpm_smd_write(pd->rpm, QCOM_SMD_RPM_ACTIVE_STATE, > + pd->res_type, pd->res_id, &req, sizeof(req)); > } > > static int rpmpd_send_corner(struct rpmpd *pd, int state, unsigned int corner) > @@ -174,13 +172,13 @@ static int rpmpd_aggregate_corner(struct rpmpd *pd) > > active_corner = max(this_active_corner, peer_active_corner); > > - ret = rpmpd_send_corner(pd, QCOM_RPM_ACTIVE_STATE, active_corner); > + ret = rpmpd_send_corner(pd, QCOM_SMD_RPM_ACTIVE_STATE, active_corner); > if (ret) > return ret; > > sleep_corner = max(this_sleep_corner, peer_sleep_corner); > > - return rpmpd_send_corner(pd, QCOM_RPM_SLEEP_STATE, sleep_corner); > + return rpmpd_send_corner(pd, QCOM_SMD_RPM_SLEEP_STATE, sleep_corner); > } > > static int rpmpd_power_on(struct generic_pm_domain *domain) > -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation