bus/tegra: Fixes for v5.2-rc1

This contains a single fix for a potential PM-related build issue.
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAlzVXUQTHHRyZWRpbmdA
 bnZpZGlhLmNvbQAKCRDdI6zXfz6zodjxD/45nKQcZWXDOhgwblsQ0deoNaFsgKmy
 n6dymbD7XNCj9+zkuYCoBRbaDIJn+2FSW5XzwLRWKA3OKKwCwPUZfROENArIL2Zw
 tRHOglhzouubpdepFzl+wyUeS5MUAnGBiXhmunvd7AfHukQoJbUGZA0fFAKHzBgg
 WFpTVaVV8XOEtZvGDVZaIMhT1LsPRBLWto/Op0QJdsU5jFZ0ccH88f8BY/w6tyWp
 fGlUuh0eutV5kolQlgs3yjSnzSNgn6z2XpbJvqeor0Vw8uvpJAMm8exQ+TFKgt9/
 oUXW8tIJE5XJO4uhS1Aaeju5d3jhtnEtVMLPEbnZFyb7BO6aZoEeqtgyTUkFXlL9
 P20D8GXWIKHSEmUZbaU2/Xk4xWHVnAJxT2NRgsVGOlPlaNuMKA2BlXFxMrwNQzC5
 tQxBvwaXKCWk6td29vQwwgZI0GIs2V1eL13V40ynluxSAUh8lsQLW7dYR/nbrdTk
 F64Jkducr4zLfynMt2b1wl7h68hbcWp6DdWOqNk5TxO2uE+tVtSKwUVNj46ttEpm
 /H1yvR2NZHv1Zhhx6gRw97O4O5mvSLqVRAPFRVmOdyhFPQmwJfb7uo51GrMGOhMq
 dZTOWjL8Xz6gxViau2x2I5hy3vtQebHxyN4p6fFQ5/JjDTRvU0dJDisMdJoSK9rB
 8EwbDFzEPMl1gQ==
 =Echw
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2019-05-16 10:54:45 -07:00
commit 23c6eddfbb

View File

@ -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,