p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ARM: pxa: stop using mach/bitfield.h 

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>
This commit is contained in:
Arnd Bergmann 2019-09-01 23:25:15 +02:00
parent 08d3df8c81
commit 2a0fd0a95a
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-pxa/idp.c
View File

@ -30,7 +30,6 @@
#include "pxa25x.h" #include "pxa25x.h"
#include "idp.h" #include "idp.h"
#include <linux/platform_data/video-pxafb.h> #include <linux/platform_data/video-pxafb.h>
#include <mach/bitfield.h>
#include <linux/platform_data/mmc-pxamci.h> #include <linux/platform_data/mmc-pxamci.h>
#include <linux/smc91x.h> #include <linux/smc91x.h>

5
arch/arm/mach-pxa/include/mach/regs-lcd.h
View File

@ -2,8 +2,6 @@
#ifndef __ASM_ARCH_REGS_LCD_H #ifndef __ASM_ARCH_REGS_LCD_H
#define __ASM_ARCH_REGS_LCD_H #define __ASM_ARCH_REGS_LCD_H
#include <mach/bitfield.h>
/* /*
* LCD Controller Registers and Bits Definitions * LCD Controller Registers and Bits Definitions
*/ */
@ -86,6 +84,9 @@
#define LCCR0_OUC (1 << 25) /* Overlay Underlay control bit */ #define LCCR0_OUC (1 << 25) /* Overlay Underlay control bit */
#define LCCR0_LDDALT (1 << 26) /* LDD alternate mapping control */ #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_PPL Fld (10, 0) /* Pixels Per Line - 1 */
#define LCCR1_DisWdth(Pixel) (((Pixel) - 1) << FShft (LCCR1_PPL)) #define LCCR1_DisWdth(Pixel) (((Pixel) - 1) << FShft (LCCR1_PPL))

2
arch/arm/mach-pxa/regs-u2d.h
View File

@ -2,8 +2,6 @@
#ifndef __ASM_ARCH_PXA3xx_U2D_H #ifndef __ASM_ARCH_PXA3xx_U2D_H
#define __ASM_ARCH_PXA3xx_U2D_H #define __ASM_ARCH_PXA3xx_U2D_H
#include <mach/bitfield.h>
/* /*
* USB2 device controller registers and bits definitions * USB2 device controller registers and bits definitions
*/ */

1
drivers/video/fbdev/pxafb.c
View File

@ -64,7 +64,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <mach/bitfield.h>
#include <linux/platform_data/video-pxafb.h> #include <linux/platform_data/video-pxafb.h>
/* /*