| Message ID | 20190906151551.1192788-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 96088a203a0b6c7564bc14167eec89c5427fd18e |
| Headers | show |
| Series | iommu: omap: mark pm functions __maybe_unused | expand |
Hi Arnd, On 9/6/19 10:15 AM, Arnd Bergmann wrote: > The runtime_pm functions are unused when CONFIG_PM is disabled: > > drivers/iommu/omap-iommu.c:1022:12: error: unused function 'omap_iommu_runtime_suspend' [-Werror,-Wunused-function] > static int omap_iommu_runtime_suspend(struct device *dev) > drivers/iommu/omap-iommu.c:1064:12: error: unused function 'omap_iommu_runtime_resume' [-Werror,-Wunused-function] > static int omap_iommu_runtime_resume(struct device *dev) > > Mark them as __maybe_unused to let gcc silently drop them > instead of warning. Curious, what defconfig is this? OMAP drivers won't be functional in general without pm_runtime, so CONFIG_PM is mandatory. But from just a CONFIG_PM option point of view, agree with the patch. > > Fixes: db8918f61d51 ("iommu/omap: streamline enable/disable through runtime pm callbacks") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Suman Anna <s-anna@ti.com> > --- > drivers/iommu/omap-iommu.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c > index 451e3c98ab2d..09c6e1c680db 100644 > --- a/drivers/iommu/omap-iommu.c > +++ b/drivers/iommu/omap-iommu.c > @@ -1019,7 +1019,7 @@ EXPORT_SYMBOL_GPL(omap_iommu_domain_activate); > * reset line. This function also saves the context of any > * locked TLBs if suspending. > **/ > -static int omap_iommu_runtime_suspend(struct device *dev) > +static __maybe_unused int omap_iommu_runtime_suspend(struct device *dev) > { > struct platform_device *pdev = to_platform_device(dev); > struct iommu_platform_data *pdata = dev_get_platdata(dev); > @@ -1061,7 +1061,7 @@ static int omap_iommu_runtime_suspend(struct device *dev) > * reset line. The function also restores any locked TLBs if > * resuming after a suspend. > **/ > -static int omap_iommu_runtime_resume(struct device *dev) > +static __maybe_unused int omap_iommu_runtime_resume(struct device *dev) > { > struct platform_device *pdev = to_platform_device(dev); > struct iommu_platform_data *pdata = dev_get_platdata(dev); >
On Fri, Sep 06, 2019 at 05:15:38PM +0200, Arnd Bergmann wrote: > drivers/iommu/omap-iommu.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied, thanks Arnd.
On Fri, Sep 6, 2019 at 5:24 PM Suman Anna <s-anna@ti.com> wrote: > > Hi Arnd, > > On 9/6/19 10:15 AM, Arnd Bergmann wrote: > > The runtime_pm functions are unused when CONFIG_PM is disabled: > > > > drivers/iommu/omap-iommu.c:1022:12: error: unused function 'omap_iommu_runtime_suspend' [-Werror,-Wunused-function] > > static int omap_iommu_runtime_suspend(struct device *dev) > > drivers/iommu/omap-iommu.c:1064:12: error: unused function 'omap_iommu_runtime_resume' [-Werror,-Wunused-function] > > static int omap_iommu_runtime_resume(struct device *dev) > > > > Mark them as __maybe_unused to let gcc silently drop them > > instead of warning. > > Curious, what defconfig is this? OMAP drivers won't be functional in > general without pm_runtime, so CONFIG_PM is mandatory. But from just a > CONFIG_PM option point of view, agree with the patch. I did some randconfig builds for testing the stuff I merged for 5.4. I don't think there are any defconfigs without CONFIG_PM. Arnd
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index 451e3c98ab2d..09c6e1c680db 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -1019,7 +1019,7 @@ EXPORT_SYMBOL_GPL(omap_iommu_domain_activate); * reset line. This function also saves the context of any * locked TLBs if suspending. **/ -static int omap_iommu_runtime_suspend(struct device *dev) +static __maybe_unused int omap_iommu_runtime_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct iommu_platform_data *pdata = dev_get_platdata(dev); @@ -1061,7 +1061,7 @@ static int omap_iommu_runtime_suspend(struct device *dev) * reset line. The function also restores any locked TLBs if * resuming after a suspend. **/ -static int omap_iommu_runtime_resume(struct device *dev) +static __maybe_unused int omap_iommu_runtime_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct iommu_platform_data *pdata = dev_get_platdata(dev);
The runtime_pm functions are unused when CONFIG_PM is disabled: drivers/iommu/omap-iommu.c:1022:12: error: unused function 'omap_iommu_runtime_suspend' [-Werror,-Wunused-function] static int omap_iommu_runtime_suspend(struct device *dev) drivers/iommu/omap-iommu.c:1064:12: error: unused function 'omap_iommu_runtime_resume' [-Werror,-Wunused-function] static int omap_iommu_runtime_resume(struct device *dev) Mark them as __maybe_unused to let gcc silently drop them instead of warning. Fixes: db8918f61d51 ("iommu/omap: streamline enable/disable through runtime pm callbacks") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/iommu/omap-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.0