diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-09 23:08:08 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-26 15:56:46 +0200 |
| commit | c14094a48d00768ee2a1defff1fee0e51dbe15bb (patch) | |
| tree | 30cee03868d85b1d17a8ccc81ceeadfbd0041110 /drivers/video | |
| parent | e3ed8b436bc32102ac2995940bc3a63c09755b63 (diff) | |
| download | linux-c14094a48d00768ee2a1defff1fee0e51dbe15bb.tar.gz linux-c14094a48d00768ee2a1defff1fee0e51dbe15bb.tar.xz | |
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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/s1d13xxxfb.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c index 5d6179ef0298..e04efb567b5c 100644 --- a/drivers/video/fbdev/s1d13xxxfb.c +++ b/drivers/video/fbdev/s1d13xxxfb.c @@ -96,18 +96,12 @@ static const struct fb_fix_screeninfo s1d13xxxfb_fix = { static inline u8 s1d13xxxfb_readreg(struct s1d13xxxfb_par *par, u16 regno) { -#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) || defined(CONFIG_PLAT_MAPPI3) - regno=((regno & 1) ? (regno & ~1L) : (regno + 1)); -#endif return readb(par->regs + regno); } static inline void s1d13xxxfb_writereg(struct s1d13xxxfb_par *par, u16 regno, u8 value) { -#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) || defined(CONFIG_PLAT_MAPPI3) - regno=((regno & 1) ? (regno & ~1L) : (regno + 1)); -#endif writeb(value, par->regs + regno); } @@ -296,11 +290,7 @@ s1d13xxxfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, dbg("s1d13xxxfb_setcolreg: pseudo %d, val %08x\n", regno, pseudo_val); -#if defined(CONFIG_PLAT_MAPPI) - ((u32 *)info->pseudo_palette)[regno] = cpu_to_le16(pseudo_val); -#else ((u32 *)info->pseudo_palette)[regno] = pseudo_val; -#endif break; case FB_VISUAL_PSEUDOCOLOR: |