lkml.org 
[lkml]   [2022]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/48] ARM: pxa: stop using mach/bitfield.h
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    There are two identical copies of mach/bitfield.h, one for
    mach-sa1100 and one for mach-pxa. The pxafb driver only
    makes use of two macros, which can be trivially open-coded
    in the header.

    Cc: dri-devel@lists.freedesktop.org
    Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
    Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    arch/arm/mach-pxa/idp.c | 1 -
    arch/arm/mach-pxa/include/mach/regs-lcd.h | 5 +++--
    arch/arm/mach-pxa/regs-u2d.h | 2 --
    drivers/video/fbdev/pxafb.c | 1 -
    4 files changed, 3 insertions(+), 6 deletions(-)

    diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
    index 57c0511472bc..525d01ddfbbb 100644
    --- a/arch/arm/mach-pxa/idp.c
    +++ b/arch/arm/mach-pxa/idp.c
    @@ -30,7 +30,6 @@
    #include "pxa25x.h"
    #include "idp.h"
    #include <linux/platform_data/video-pxafb.h>
    -#include <mach/bitfield.h>
    #include <linux/platform_data/mmc-pxamci.h>
    #include <linux/smc91x.h>

    diff --git a/arch/arm/mach-pxa/include/mach/regs-lcd.h b/arch/arm/mach-pxa/include/mach/regs-lcd.h
    index e2b6e3d1f625..6a434675f84a 100644
    --- a/arch/arm/mach-pxa/include/mach/regs-lcd.h
    +++ b/arch/arm/mach-pxa/include/mach/regs-lcd.h
    @@ -2,8 +2,6 @@
    #ifndef __ASM_ARCH_REGS_LCD_H
    #define __ASM_ARCH_REGS_LCD_H

    -#include <mach/bitfield.h>
    -
    /*
    * LCD Controller Registers and Bits Definitions
    */
    @@ -86,6 +84,9 @@
    #define LCCR0_OUC (1 << 25) /* Overlay Underlay control bit */
    #define LCCR0_LDDALT (1 << 26) /* LDD alternate mapping control */

    +#define Fld(Size, Shft) (((Size) << 16) + (Shft))
    +#define FShft(Field) ((Field) & 0x0000FFFF)
    +
    #define LCCR1_PPL Fld (10, 0) /* Pixels Per Line - 1 */
    #define LCCR1_DisWdth(Pixel) (((Pixel) - 1) << FShft (LCCR1_PPL))

    diff --git a/arch/arm/mach-pxa/regs-u2d.h b/arch/arm/mach-pxa/regs-u2d.h
    index fe4c80ad87ec..ab517ba62c9a 100644
    --- a/arch/arm/mach-pxa/regs-u2d.h
    +++ b/arch/arm/mach-pxa/regs-u2d.h
    @@ -2,8 +2,6 @@
    #ifndef __ASM_ARCH_PXA3xx_U2D_H
    #define __ASM_ARCH_PXA3xx_U2D_H

    -#include <mach/bitfield.h>
    -
    /*
    * USB2 device controller registers and bits definitions
    */
    diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
    index e3d1a184d2be..edf080f64a8c 100644
    --- a/drivers/video/fbdev/pxafb.c
    +++ b/drivers/video/fbdev/pxafb.c
    @@ -64,7 +64,6 @@
    #include <asm/io.h>
    #include <asm/irq.h>
    #include <asm/div64.h>
    -#include <mach/bitfield.h>
    #include <linux/platform_data/video-pxafb.h>

    /*
    --
    2.29.2
    \
     
     \ /
      Last update: 2022-04-19 18:46    [W:5.477 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site