Commit 23c6eddf authored by Olof Johansson's avatar Olof Johansson

Merge tag 'tegra-for-5.2-bus-fixes' of...

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: default avatarOlof Johansson <olof@lixom.net>
parents 982c736c 6d616560
...@@ -170,8 +170,7 @@ int tegra_ahb_enable_smmu(struct device_node *dn) ...@@ -170,8 +170,7 @@ int tegra_ahb_enable_smmu(struct device_node *dn)
EXPORT_SYMBOL(tegra_ahb_enable_smmu); EXPORT_SYMBOL(tegra_ahb_enable_smmu);
#endif #endif
#ifdef CONFIG_PM static int __maybe_unused tegra_ahb_suspend(struct device *dev)
static int tegra_ahb_suspend(struct device *dev)
{ {
int i; int i;
struct tegra_ahb *ahb = dev_get_drvdata(dev); struct tegra_ahb *ahb = dev_get_drvdata(dev);
...@@ -181,7 +180,7 @@ static int tegra_ahb_suspend(struct device *dev) ...@@ -181,7 +180,7 @@ static int tegra_ahb_suspend(struct device *dev)
return 0; return 0;
} }
static int tegra_ahb_resume(struct device *dev) static int __maybe_unused tegra_ahb_resume(struct device *dev)
{ {
int i; int i;
struct tegra_ahb *ahb = dev_get_drvdata(dev); struct tegra_ahb *ahb = dev_get_drvdata(dev);
...@@ -190,7 +189,6 @@ static int tegra_ahb_resume(struct device *dev) ...@@ -190,7 +189,6 @@ static int tegra_ahb_resume(struct device *dev)
gizmo_writel(ahb, ahb->ctx[i], tegra_ahb_gizmo[i]); gizmo_writel(ahb, ahb->ctx[i], tegra_ahb_gizmo[i]);
return 0; return 0;
} }
#endif
static UNIVERSAL_DEV_PM_OPS(tegra_ahb_pm, static UNIVERSAL_DEV_PM_OPS(tegra_ahb_pm,
tegra_ahb_suspend, tegra_ahb_suspend,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment