Message ID | 20220523224702.2002652-1-nathan@kernel.org |
---|---|
State | Accepted |
Commit | 79f9fbe303520d2c32b70f04f2bb02cc2baaa4c3 |
Headers | show |
Series | mailbox: qcom-ipcc: Fix -Wunused-function with CONFIG_PM_SLEEP=n | expand |
Hey Nathan, Thanks for the fix! On 5/24/22 4:17 AM, Nathan Chancellor wrote: > When CONFIG_PM_SLEEP is not set, there is a warning that > qcom_ipcc_pm_resume() is unused: > > drivers/mailbox/qcom-ipcc.c:258:12: error: 'qcom_ipcc_pm_resume' defined but not used [-Werror=unused-function] > 258 | static int qcom_ipcc_pm_resume(struct device *dev) > | ^~~~~~~~~~~~~~~~~~~ > cc1: all warnings being treated as errors > > Commit 1a3c7bb08826 ("PM: core: Add new *_PM_OPS macros, deprecate old > ones") reworked the PM_OPS macros to avoid this problem. Use > NOIRQ_SYSTEM_SLEEP_PM_OPS directly so that qcom_ipcc_pm_resume() always > appears to be used to the compiler, even though it will be dead code > eliminated in the !CONFIG_PM_SLEEP case. > > Fixes: c25f77899753 ("mailbox: qcom-ipcc: Log the pending interrupt during resume") > Signed-off-by: Nathan Chancellor <nathan@kernel.org> Reviewed-by: Sibi Sankar <quic_sibis@quicinc.com> > --- > drivers/mailbox/qcom-ipcc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mailbox/qcom-ipcc.c b/drivers/mailbox/qcom-ipcc.c > index 2583b20cdeb7..31d58b7d55fe 100644 > --- a/drivers/mailbox/qcom-ipcc.c > +++ b/drivers/mailbox/qcom-ipcc.c > @@ -344,7 +344,7 @@ static const struct of_device_id qcom_ipcc_of_match[] = { > MODULE_DEVICE_TABLE(of, qcom_ipcc_of_match); > > static const struct dev_pm_ops qcom_ipcc_dev_pm_ops = { > - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(NULL, qcom_ipcc_pm_resume) > + NOIRQ_SYSTEM_SLEEP_PM_OPS(NULL, qcom_ipcc_pm_resume) > }; > > static struct platform_driver qcom_ipcc_driver = { > > base-commit: bca1a1004615efe141fd78f360ecc48c60bc4ad5 >
On Mon, May 23, 2022 at 03:47:02PM -0700, Nathan Chancellor wrote: > When CONFIG_PM_SLEEP is not set, there is a warning that > qcom_ipcc_pm_resume() is unused: > > drivers/mailbox/qcom-ipcc.c:258:12: error: 'qcom_ipcc_pm_resume' defined but not used [-Werror=unused-function] > 258 | static int qcom_ipcc_pm_resume(struct device *dev) > | ^~~~~~~~~~~~~~~~~~~ > cc1: all warnings being treated as errors > > Commit 1a3c7bb08826 ("PM: core: Add new *_PM_OPS macros, deprecate old > ones") reworked the PM_OPS macros to avoid this problem. Use > NOIRQ_SYSTEM_SLEEP_PM_OPS directly so that qcom_ipcc_pm_resume() always > appears to be used to the compiler, even though it will be dead code > eliminated in the !CONFIG_PM_SLEEP case. > > Fixes: c25f77899753 ("mailbox: qcom-ipcc: Log the pending interrupt during resume") > Signed-off-by: Nathan Chancellor <nathan@kernel.org> My bad, I missed this. Thanks for the fix! Reviewed-by: Manivannan Sadhasivam <mani@kernel.org> Thanks, Mani > --- > drivers/mailbox/qcom-ipcc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mailbox/qcom-ipcc.c b/drivers/mailbox/qcom-ipcc.c > index 2583b20cdeb7..31d58b7d55fe 100644 > --- a/drivers/mailbox/qcom-ipcc.c > +++ b/drivers/mailbox/qcom-ipcc.c > @@ -344,7 +344,7 @@ static const struct of_device_id qcom_ipcc_of_match[] = { > MODULE_DEVICE_TABLE(of, qcom_ipcc_of_match); > > static const struct dev_pm_ops qcom_ipcc_dev_pm_ops = { > - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(NULL, qcom_ipcc_pm_resume) > + NOIRQ_SYSTEM_SLEEP_PM_OPS(NULL, qcom_ipcc_pm_resume) > }; > > static struct platform_driver qcom_ipcc_driver = { > > base-commit: bca1a1004615efe141fd78f360ecc48c60bc4ad5 > -- > 2.36.1 >
diff --git a/drivers/mailbox/qcom-ipcc.c b/drivers/mailbox/qcom-ipcc.c index 2583b20cdeb7..31d58b7d55fe 100644 --- a/drivers/mailbox/qcom-ipcc.c +++ b/drivers/mailbox/qcom-ipcc.c @@ -344,7 +344,7 @@ static const struct of_device_id qcom_ipcc_of_match[] = { MODULE_DEVICE_TABLE(of, qcom_ipcc_of_match); static const struct dev_pm_ops qcom_ipcc_dev_pm_ops = { - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(NULL, qcom_ipcc_pm_resume) + NOIRQ_SYSTEM_SLEEP_PM_OPS(NULL, qcom_ipcc_pm_resume) }; static struct platform_driver qcom_ipcc_driver = {
When CONFIG_PM_SLEEP is not set, there is a warning that qcom_ipcc_pm_resume() is unused: drivers/mailbox/qcom-ipcc.c:258:12: error: 'qcom_ipcc_pm_resume' defined but not used [-Werror=unused-function] 258 | static int qcom_ipcc_pm_resume(struct device *dev) | ^~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Commit 1a3c7bb08826 ("PM: core: Add new *_PM_OPS macros, deprecate old ones") reworked the PM_OPS macros to avoid this problem. Use NOIRQ_SYSTEM_SLEEP_PM_OPS directly so that qcom_ipcc_pm_resume() always appears to be used to the compiler, even though it will be dead code eliminated in the !CONFIG_PM_SLEEP case. Fixes: c25f77899753 ("mailbox: qcom-ipcc: Log the pending interrupt during resume") Signed-off-by: Nathan Chancellor <nathan@kernel.org> --- drivers/mailbox/qcom-ipcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: bca1a1004615efe141fd78f360ecc48c60bc4ad5