| Message ID | 20170823134303.1000996-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 6ce5b0f22d6061b33aaf302f73302f402fea0c17 |
| Headers | show |
On Wed, Aug 23, 2017 at 9:42 AM, Arnd Bergmann <arnd@arndb.de> wrote: > The qcom_iommu_disable_clocks() function is only called from PM > code that is hidden in an #ifdef, causing a harmless warning without > CONFIG_PM: > > drivers/iommu/qcom_iommu.c:601:13: error: 'qcom_iommu_disable_clocks' defined but not used [-Werror=unused-function] > static void qcom_iommu_disable_clocks(struct qcom_iommu_dev *qcom_iommu) > drivers/iommu/qcom_iommu.c:581:12: error: 'qcom_iommu_enable_clocks' defined but not used [-Werror=unused-function] > static int qcom_iommu_enable_clocks(struct qcom_iommu_dev *qcom_iommu) > > Replacing that #ifdef with __maybe_unused annotations lets the compiler > drop the functions silently instead. > > Fixes: 0ae349a0f33f ("iommu/qcom: Add qcom_iommu") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> thanks Acked-by: Rob Clark <robdclark@gmail.com> > --- > drivers/iommu/qcom_iommu.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c > index 48b62aa52787..c8a587d034b0 100644 > --- a/drivers/iommu/qcom_iommu.c > +++ b/drivers/iommu/qcom_iommu.c > @@ -860,8 +860,7 @@ static int qcom_iommu_device_remove(struct platform_device *pdev) > return 0; > } > > -#ifdef CONFIG_PM > -static int qcom_iommu_resume(struct device *dev) > +static int __maybe_unused qcom_iommu_resume(struct device *dev) > { > struct platform_device *pdev = to_platform_device(dev); > struct qcom_iommu_dev *qcom_iommu = platform_get_drvdata(pdev); > @@ -869,7 +868,7 @@ static int qcom_iommu_resume(struct device *dev) > return qcom_iommu_enable_clocks(qcom_iommu); > } > > -static int qcom_iommu_suspend(struct device *dev) > +static int __maybe_unused qcom_iommu_suspend(struct device *dev) > { > struct platform_device *pdev = to_platform_device(dev); > struct qcom_iommu_dev *qcom_iommu = platform_get_drvdata(pdev); > @@ -878,7 +877,6 @@ static int qcom_iommu_suspend(struct device *dev) > > return 0; > } > -#endif > > static const struct dev_pm_ops qcom_iommu_pm_ops = { > SET_RUNTIME_PM_OPS(qcom_iommu_suspend, qcom_iommu_resume, NULL) > -- > 2.9.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Aug 23, 2017 at 03:42:45PM +0200, Arnd Bergmann wrote: > The qcom_iommu_disable_clocks() function is only called from PM > code that is hidden in an #ifdef, causing a harmless warning without > CONFIG_PM: > > drivers/iommu/qcom_iommu.c:601:13: error: 'qcom_iommu_disable_clocks' defined but not used [-Werror=unused-function] > static void qcom_iommu_disable_clocks(struct qcom_iommu_dev *qcom_iommu) > drivers/iommu/qcom_iommu.c:581:12: error: 'qcom_iommu_enable_clocks' defined but not used [-Werror=unused-function] > static int qcom_iommu_enable_clocks(struct qcom_iommu_dev *qcom_iommu) > > Replacing that #ifdef with __maybe_unused annotations lets the compiler > drop the functions silently instead. > > Fixes: 0ae349a0f33f ("iommu/qcom: Add qcom_iommu") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/iommu/qcom_iommu.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c index 48b62aa52787..c8a587d034b0 100644 --- a/drivers/iommu/qcom_iommu.c +++ b/drivers/iommu/qcom_iommu.c @@ -860,8 +860,7 @@ static int qcom_iommu_device_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static int qcom_iommu_resume(struct device *dev) +static int __maybe_unused qcom_iommu_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct qcom_iommu_dev *qcom_iommu = platform_get_drvdata(pdev); @@ -869,7 +868,7 @@ static int qcom_iommu_resume(struct device *dev) return qcom_iommu_enable_clocks(qcom_iommu); } -static int qcom_iommu_suspend(struct device *dev) +static int __maybe_unused qcom_iommu_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct qcom_iommu_dev *qcom_iommu = platform_get_drvdata(pdev); @@ -878,7 +877,6 @@ static int qcom_iommu_suspend(struct device *dev) return 0; } -#endif static const struct dev_pm_ops qcom_iommu_pm_ops = { SET_RUNTIME_PM_OPS(qcom_iommu_suspend, qcom_iommu_resume, NULL)
The qcom_iommu_disable_clocks() function is only called from PM code that is hidden in an #ifdef, causing a harmless warning without CONFIG_PM: drivers/iommu/qcom_iommu.c:601:13: error: 'qcom_iommu_disable_clocks' defined but not used [-Werror=unused-function] static void qcom_iommu_disable_clocks(struct qcom_iommu_dev *qcom_iommu) drivers/iommu/qcom_iommu.c:581:12: error: 'qcom_iommu_enable_clocks' defined but not used [-Werror=unused-function] static int qcom_iommu_enable_clocks(struct qcom_iommu_dev *qcom_iommu) Replacing that #ifdef with __maybe_unused annotations lets the compiler drop the functions silently instead. Fixes: 0ae349a0f33f ("iommu/qcom: Add qcom_iommu") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/iommu/qcom_iommu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html