From patchwork Fri Oct 18 15:41:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11198889 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A103513BD for ; Fri, 18 Oct 2019 15:47:54 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 897B32064B for ; Fri, 18 Oct 2019 15:47:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 897B32064B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arndb.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF0C76EAAD; Fri, 18 Oct 2019 15:47:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 310 seconds by postgrey-1.36 at gabe; Fri, 18 Oct 2019 15:47:52 UTC Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0DC4B6EAAD for ; Fri, 18 Oct 2019 15:47:51 +0000 (UTC) Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MAwTn-1iAEvS44c5-00BIwO; Fri, 18 Oct 2019 17:42:20 +0200 From: Arnd Bergmann To: Daniel Mack , Haojian Zhuang , Robert Jarzmik Subject: [PATCH 06/46] ARM: pxa: stop using mach/bitfield.h Date: Fri, 18 Oct 2019 17:41:21 +0200 Message-Id: <20191018154201.1276638-6-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191018154052.1276506-1-arnd@arndb.de> References: <20191018154052.1276506-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:RMPIXEZ8B8Uok2FSd/RsBSJ9LSkrToSq1PlXx8YByCDFZq6HKXO KnKe5fjMzjccpDiN5gwwbCczfg8ynNnl+hPrJO+a8PXsXmntRxNg4ozDolk9RjQpP8Zdpik lbMmZLkdEO2w03TYSr5mMYOpaKIOACmd3xYqlWYLZ96deVragbPJL5squJTDw1pzXyT0Dxe cZJNuN3xPdaEgCk9TkpGA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:982ohRnmu7U=:nS1yqCQrJSvJrk3cY95J1h CEE8Zf8oRJHf3WIE6e9PdMPmOvXYslqLzYUJJ9TA9K7m4cXXQ2ZTZk0sd/1Es4rYixE7Cdnim cFYZDXYLkyHPNV9EoiwKlSJ5vCXMv9LJ2o8LexYP6OVeFiKIlntTO0tVhsVJmsus2JfyxjD3A 2inw3EUozUe6Pkloap4GUFlDTab3clV4ZQ2JQ1Do0A3JalIfy7DeqWuT/FbWFqi9Z6dWUVmGW 0cb2JNBPjubLZrLmb+8MkSPfQDIC9towBgjbnq2HGywZcfZcnzEnmghGJqlmNwHCyby89/iTA RNZbKG6p8BooVxw6SsqPW4PyHSetUpriCUcMUcLDb7udKPA6UDkI/HQ3Vq08CI3yH2BN3H5wL C/tdmdR5f5Ip6F11DenTL7T7lpyvNXYKcJiMd0v4+84uuZOl506kFIdHzanXpWOGi170efw/v a7RTYnQmDxgNKx6dgWMI6kj/WosuMVXzRiDW4r7hsSqW/zTzj0/aQtL5NbAKIt3PtBEzOeWnl AUUOanN5c8Kn+6vad6iM5pie66aodmL1v3FqoOaA1FEH3a9RIY7mp6hqv93w/xJiCMgJAvk8L Dgi6+LmoB57u62T33+qQsLoS4DY1f2q94SBma3IlHXwnEy6+jshryXQGWl3zfkIsZWPAN+bR+ bgYm7rQdgyyoIfIoU0B3V/5DkkJIsgg0e5YbTilrzPJzmFU3t+Hs/LXbuzixe3cl0+Vo5o/n3 I2sR3TwRRY6m/P9reiTuKK7wX5qvXFmcboGTcbGa6pP/rYml8xsjjCdpQhesH4qUNfPucs4MA UswVu6cpoyyLN7Zq11fkxmF2t3OrtxDBnp5BNQbB8EWR7SzXXEhYxrDnJaCliJyZnddeK+faE 0XZbJ+FfuzRKgMCjJdpg== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 Cc: dri-devel@lists.freedesktop.org Signed-off-by: Arnd Bergmann Acked-by: Bartlomiej Zolnierkiewicz --- 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 -#include #include #include 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 - /* * 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 - /* * 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 #include #include -#include #include /*