Message ID | 1669726428-3140-1-git-send-email-quic_srivasam@quicinc.com |
---|---|
State | Accepted |
Commit | e8679db2970f04ee5281c042977fff880a3c045a |
Headers | show |
Series | ASoC: qcom: lpass-sc7180: Add maybe_unused tag for system PM ops | expand |
On Tue, Nov 29, 2022 at 06:23:48PM +0530, Srinivasa Rao Mandadapu wrote: > Add __maybe_unused tag for system PM ops suspend and resume. > This is required to fix allmodconfig compilation issue. > Fixes: c3bf7699747c ("ASoC: qcom: lpass-sc7280: Add system suspend/resume PM ops") This is incorrect, it should be '2d68148f8f85 ("ASoC: qcom: lpass-sc7180: Add system suspend/resume PM ops")'. I see you fixed that in v2, but this patch has already been applied ... Srinivasa, it seems a similar patch is needed for commit c3bf7699747c ("ASoC: qcom: lpass-sc7280: Add system suspend/resume PM ops"). For that you could use SYSTEM_SLEEP_PM_OPS() instead of the maybe_unused tags as suggested by Nathan. Mark, I appreciate you being responsive and picking patches quickly, it might help though to leave 'external' reviewers at least some time to provide their feedback :)
On Wed, Nov 30, 2022 at 05:37:50PM +0000, Matthias Kaehlcke wrote: > The tag of the applied patch is incorrect too, which is actually what I noticed: > > Fixes: a3a96e93cc88 ("ASoC: qcom: lpass-sc7280: Add system suspend/resume PM ops") > > This patch is for sc7180, so it should be: > > Fixes: 2d68148f8f85 ("ASoC: qcom: lpass-sc7180: Add system suspend/resume PM ops") Oh, well. It's just a fixes tag for something that has only been in -next, it doesn't really matter that much.
On 12/1/2022 12:42 AM, Mark Brown wrote: > On Wed, Nov 30, 2022 at 05:37:50PM +0000, Matthias Kaehlcke wrote: > >> The tag of the applied patch is incorrect too, which is actually what I noticed: >> >> Fixes: a3a96e93cc88 ("ASoC: qcom: lpass-sc7280: Add system suspend/resume PM ops") >> >> This patch is for sc7180, so it should be: >> >> Fixes: 2d68148f8f85 ("ASoC: qcom: lpass-sc7180: Add system suspend/resume PM ops") Actually with the fix already posted v2. > Oh, well. It's just a fixes tag for something that has only been in > -next, it doesn't really matter that much. Okay. Sorry for Inconvenience.
Thanks for your time Matthias, On 11/30/2022 1:38 AM, Matthias Kaehlcke wrote: > On Tue, Nov 29, 2022 at 09:28:33PM +0530, Srinivasa Rao Mandadapu wrote: >> Thanks for your tie Nathan!!! >> >> On 11/29/2022 9:15 PM, Nathan Chancellor wrote: >>> On Tue, Nov 29, 2022 at 06:23:48PM +0530, Srinivasa Rao Mandadapu wrote: >>>> Add __maybe_unused tag for system PM ops suspend and resume. >>>> This is required to fix allmodconfig compilation issue. >>>> Fixes: c3bf7699747c ("ASoC: qcom: lpass-sc7280: Add system suspend/resume PM ops") >>>> >>>> Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com> >>> A better solution would be replacing SET_SYSTEM_SLEEP_PM_OPS() with >>> SYSTEM_SLEEP_PM_OPS(), which was added to avoid needing to add these >>> '__maybe_unused' attributes to these functions. See commit 1a3c7bb08826 >>> ("PM: core: Add new *_PM_OPS macros, deprecate old ones") for more info. >> Tried this option but as this patch required for Kernel 5.4 version code >> base, >> >> SYSTEM_SLEEP_PM_OPS didn't work. > Older downstream trees needing a change shouldn't impact how a change is done > upstream. The change should be what's best for the upstream kernel. Downstream > kernels can do backports which might differ from the upstream solution or > pick the missing dependencies (which might not be too hard in this case). Okay. Will take care next time. > >>>> --- >>>> sound/soc/qcom/lpass-sc7180.c | 4 ++-- >>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c >>>> index b96b85a..41db661 100644 >>>> --- a/sound/soc/qcom/lpass-sc7180.c >>>> +++ b/sound/soc/qcom/lpass-sc7180.c >>>> @@ -163,14 +163,14 @@ static int sc7180_lpass_exit(struct platform_device *pdev) >>>> return 0; >>>> } >>>> -static int sc7180_lpass_dev_resume(struct device *dev) >>>> +static int __maybe_unused sc7180_lpass_dev_resume(struct device *dev) >>>> { >>>> struct lpass_data *drvdata = dev_get_drvdata(dev); >>>> return clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); >>>> } >>>> -static int sc7180_lpass_dev_suspend(struct device *dev) >>>> +static int __maybe_unused sc7180_lpass_dev_suspend(struct device *dev) >>>> { >>>> struct lpass_data *drvdata = dev_get_drvdata(dev); >>>> -- >>>> 2.7.4 >>>> >>>>
diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c index b96b85a..41db661 100644 --- a/sound/soc/qcom/lpass-sc7180.c +++ b/sound/soc/qcom/lpass-sc7180.c @@ -163,14 +163,14 @@ static int sc7180_lpass_exit(struct platform_device *pdev) return 0; } -static int sc7180_lpass_dev_resume(struct device *dev) +static int __maybe_unused sc7180_lpass_dev_resume(struct device *dev) { struct lpass_data *drvdata = dev_get_drvdata(dev); return clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); } -static int sc7180_lpass_dev_suspend(struct device *dev) +static int __maybe_unused sc7180_lpass_dev_suspend(struct device *dev) { struct lpass_data *drvdata = dev_get_drvdata(dev);
Add __maybe_unused tag for system PM ops suspend and resume. This is required to fix allmodconfig compilation issue. Fixes: c3bf7699747c ("ASoC: qcom: lpass-sc7280: Add system suspend/resume PM ops") Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com> --- sound/soc/qcom/lpass-sc7180.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)