Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fbdev: s1d13xxxfb: remove m32r specific hacks

The m32r architecture is being removed, so this is no longer needed.

Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

-10
-10
drivers/video/fbdev/s1d13xxxfb.c
··· 96 96 static inline u8 97 97 s1d13xxxfb_readreg(struct s1d13xxxfb_par *par, u16 regno) 98 98 { 99 - #if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) || defined(CONFIG_PLAT_MAPPI3) 100 - regno=((regno & 1) ? (regno & ~1L) : (regno + 1)); 101 - #endif 102 99 return readb(par->regs + regno); 103 100 } 104 101 105 102 static inline void 106 103 s1d13xxxfb_writereg(struct s1d13xxxfb_par *par, u16 regno, u8 value) 107 104 { 108 - #if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) || defined(CONFIG_PLAT_MAPPI3) 109 - regno=((regno & 1) ? (regno & ~1L) : (regno + 1)); 110 - #endif 111 105 writeb(value, par->regs + regno); 112 106 } 113 107 ··· 290 296 dbg("s1d13xxxfb_setcolreg: pseudo %d, val %08x\n", 291 297 regno, pseudo_val); 292 298 293 - #if defined(CONFIG_PLAT_MAPPI) 294 - ((u32 *)info->pseudo_palette)[regno] = cpu_to_le16(pseudo_val); 295 - #else 296 299 ((u32 *)info->pseudo_palette)[regno] = pseudo_val; 297 - #endif 298 300 299 301 break; 300 302 case FB_VISUAL_PSEUDOCOLOR: