Skip to contentSkip to conversation

radeon: Conditionally compile PM code

PATCH Applied Thierry Reding 2 participants 2 messages Sep 18, 2013 – Sep 20, 2013 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 radeon: Conditionally compile PM code

The power management code is only used on X86 and PowerMac. To prevent the compiler from warning about unused code, only build when PM and one of X86 or PowerMac is selected.

---
 drivers/video/aty/radeon_pm.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/video/aty/radeon_pm.c +6 -1
index f7091ec..f4317f1 100644
@@ -1427,6 +1427,8 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)
 	mdelay( 15);
 }
 
+#if defined(CONFIG_PM)
+#if defined(CONFIG_X86) || defined(CONFIG_PPC_PMAC)
 static void radeon_pm_reset_pad_ctlr_strength(struct radeonfb_info *rinfo)
 {
 	u32 tmp, tmp2;
@@ -1939,9 +1941,10 @@ static void radeon_reinitialize_M10(struct radeonfb_info *rinfo)
 	 */
 	radeon_pm_m10_enable_lvds_spread_spectrum(rinfo);
 }
+#endif
 
 #ifdef CONFIG_PPC_OF
-
+#ifdef CONFIG_PPC_PMAC
 static void radeon_pm_m9p_reconfigure_mc(struct radeonfb_info *rinfo)
 {
 	OUTREG(MC_CNTL, rinfo->save_regs[46]);
@@ -2202,6 +2205,8 @@ static void radeon_reinitialize_M9P(struct radeonfb_info *rinfo)
 	radeon_pm_restore_pixel_pll(rinfo);
 	radeon_pm_m10_enable_lvds_spread_spectrum(rinfo);
 }
+#endif
+#endif
 
 #if 0 /* Not ready yet */
 static void radeon_reinitialize_QW(struct radeonfb_info *rinfo)
Signature · 1 line
1.8.4
#1 lore raw
Quoted 5 lines · Thierry Reding

The power management code is only used on X86 and PowerMac. To prevent the compiler from warning about unused code, only build when PM and one of X86 or PowerMac is selected.

Thanks, applied for 3.13.

Tomi