soc: tegra: Fix tegra_pmc_get_suspend_mode definition (e4cc4f54) · Commits · 戴 / test

When CONFIG_PM_SLEEP is disabled, the function is not defined, causing a link failure: arm-linux-gnueabi-ld: drivers/cpuidle/cpuidle-tegra.o: in function `tegra_cpuidle_probe': cpuidle-tegra.c:(.text+0x24): undefined reference to `tegra_pmc_get_suspend_mode' Change the #ifdef check according to the definition. Fixes: ("cpuidle: tegra: Disable CC6 state if LP2 unavailable") Signed-off-by:

Arnd Bergmann <arnd@arndb.de> Reviewed-by:

Dmitry Osipenko <digetx@gmail.com> Acked-by:

Thierry Reding <treding@nvidia.com> Signed-off-by:

Thierry Reding <treding@nvidia.com>

include/soc/tegra/pmc.h

+9 −6

Original line number	Diff line number	Diff line
		@@ -168,7 +168,6 @@ int tegra_io_pad_power_disable(enum tegra_io_pad id);
		int tegra_io_rail_power_on(unsigned int id);
		int tegra_io_rail_power_off(unsigned int id);

		enum tegra_suspend_mode tegra_pmc_get_suspend_mode(void);
		void tegra_pmc_set_suspend_mode(enum tegra_suspend_mode mode);
		void tegra_pmc_enter_suspend_mode(enum tegra_suspend_mode mode);

		@@ -220,11 +219,6 @@ static inline int tegra_io_rail_power_off(unsigned int id)
		return -ENOSYS;
		}

		static inline enum tegra_suspend_mode tegra_pmc_get_suspend_mode(void)
		{
		return TEGRA_SUSPEND_NONE;
		}

		static inline void tegra_pmc_set_suspend_mode(enum tegra_suspend_mode mode)
		{
		}
		@@ -235,4 +229,13 @@ static inline void tegra_pmc_enter_suspend_mode(enum tegra_suspend_mode mode)

		#endif /* CONFIG_SOC_TEGRA_PMC */

		#if defined(CONFIG_SOC_TEGRA_PMC) && defined(CONFIG_PM_SLEEP)
		enum tegra_suspend_mode tegra_pmc_get_suspend_mode(void);
		#else
		static inline enum tegra_suspend_mode tegra_pmc_get_suspend_mode(void)
		{
		return TEGRA_SUSPEND_NONE;
		}
		#endif

		#endif /* __SOC_TEGRA_PMC_H__ */

Admin message