lkml.org 
[lkml]   [2018]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/47] fbdev: s1d13xxxfb: remove m32r specific hacks
    Date
    The m32r architecture is being removed, so this is no longer needed.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    drivers/video/fbdev/s1d13xxxfb.c | 10 ----------
    1 file changed, 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:
    --
    2.9.0
    \
     
     \ /
      Last update: 2018-03-14 16:44    [W:2.231 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site