diff options
| author | Olof Johansson <olof@lixom.net> | 2019-05-16 10:54:45 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-05-16 10:54:45 -0700 |
| commit | 23c6eddfbb0c9f3d36d4c1f0a1b6c52ec09b9955 (patch) | |
| tree | 773533d5f9fa229c7c0463fa2502c359746ff0db | |
| parent | 982c736cd67720d012cbd1379211a3736f887f5e (diff) | |
| parent | 6d6165603e162e3d391f35853a4ab232ab0db064 (diff) | |
Merge tag 'tegra-for-5.2-bus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/late
bus/tegra: Fixes for v5.2-rc1
This contains a single fix for a potential PM-related build issue.
* tag 'tegra-for-5.2-bus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
amba: tegra-ahb: Mark PM functions as __maybe_unused
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | drivers/amba/tegra-ahb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c index b0b688c481e8..3751d811be39 100644 --- a/drivers/amba/tegra-ahb.c +++ b/drivers/amba/tegra-ahb.c @@ -170,8 +170,7 @@ int tegra_ahb_enable_smmu(struct device_node *dn) EXPORT_SYMBOL(tegra_ahb_enable_smmu); #endif -#ifdef CONFIG_PM -static int tegra_ahb_suspend(struct device *dev) +static int __maybe_unused tegra_ahb_suspend(struct device *dev) { int i; struct tegra_ahb *ahb = dev_get_drvdata(dev); @@ -181,7 +180,7 @@ static int tegra_ahb_suspend(struct device *dev) return 0; } -static int tegra_ahb_resume(struct device *dev) +static int __maybe_unused tegra_ahb_resume(struct device *dev) { int i; struct tegra_ahb *ahb = dev_get_drvdata(dev); @@ -190,7 +189,6 @@ static int tegra_ahb_resume(struct device *dev) gizmo_writel(ahb, ahb->ctx[i], tegra_ahb_gizmo[i]); return 0; } -#endif static UNIVERSAL_DEV_PM_OPS(tegra_ahb_pm, tegra_ahb_suspend, |