Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH 06/46] ARM: pxa: stop using mach/bitfield.h
To:     Arnd Bergmann <arnd@arndb.de>
Cc:     Daniel Mack <daniel@zonque.org>,
        Haojian Zhuang <haojian.zhuang@gmail.com>,
        Robert Jarzmik <robert.jarzmik@free.fr>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        Linus Walleij <linus.walleij@linaro.org>,
        dri-devel@lists.freedesktop.org
From:   Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Message-ID: <ec86366a-c2fc-9400-31dc-ed1440ec9904@samsung.com>
Date:   Fri, 8 Nov 2019 15:39:43 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
        Thunderbird/60.8.0
MIME-Version: 1.0
In-Reply-To: <20191018154201.1276638-6-arnd@arndb.de>
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
CMS-TYPE: 201P
References: <20191018154052.1276506-1-arnd@arndb.de>
        <CGME20191018154225epcas4p2b2e722620511ada1014107d9e100ab35@epcas4p2.samsung.com>
        <20191018154201.1276638-6-arnd@arndb.de>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


On 10/18/19 5:41 PM, Arnd Bergmann wrote:
> 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: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

> ---
>  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 ece691a0f18a..e68b8a69db92 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>
>  
>  /*
>