From patchwork Fri Aug 2 14:50:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2837963 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D3AEBBF535 for ; Fri, 2 Aug 2013 14:51:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A658020452 for ; Fri, 2 Aug 2013 14:51:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73B2320451 for ; Fri, 2 Aug 2013 14:51:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753747Ab3HBOvE (ORCPT ); Fri, 2 Aug 2013 10:51:04 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:61372 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750766Ab3HBOux (ORCPT ); Fri, 2 Aug 2013 10:50:53 -0400 Received: from axis700.grange (dslb-178-001-230-204.pools.arcor-ip.net [178.1.230.204]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0LZpVp-1ULnTD3lXB-00llTx; Fri, 02 Aug 2013 16:50:43 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 67D1A40BB3; Fri, 2 Aug 2013 16:50:42 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1V5Ggk-0006H7-7W; Fri, 02 Aug 2013 16:50:42 +0200 From: Guennadi Liakhovetski To: linux-sh@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Magnus Damm , Simon Horman , Laurent Pinchart , Vinod Koul , Sergei Shtylyov , Guennadi Liakhovetski Subject: [PATCH v5 2/7] DMA: shdma: remove private and unused defines from a global header Date: Fri, 2 Aug 2013 16:50:37 +0200 Message-Id: <1375455042-24093-3-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1375455042-24093-1-git-send-email-g.liakhovetski@gmx.de> References: <1375455042-24093-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:XLQb/IcJugbeKOAtYQ6N/NfWF3o18Ss+Z8RZOl/APV/ lkkI6ES/h+ee2CzZH6CYQmoSZ9wkd1hn6pgO0jvcDokwl/q9tl s/Niy94bURcMUx8RWsstoTxg/KDv9ew2/Yga7ejCrIxPLzhdbd E/tyb8R5gkPnEixa3HE7gCwrFzkEEa0NwsZ7i1rPOrHJR2Z9Z9 zOmHUb/iukL96rnq++25OH3A41wDU369f6BI2+m7M/87a9W4w0 oZsVtC7/Y6M1idYUFF9slf6nswCB7/FDK++HUlV1qkcP+awbzD xkrOiOy7Q/0j/p7q3Gkb7OMlQDxHAFn23P642wtj8tdFeGqg9a zv3LECnqqEYZIMfj58Ie7lCSNKalFVleeyA+4rS1z4PltQjW9f 019+GD5ZOuJbg== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Macros, named like TEND or SAR lack a namespace and are too broadly named for a global header. Besides, they aren't needed globally. Move them to where they belong - into the driver. Some other macros aren't used at all, remove them. Signed-off-by: Guennadi Liakhovetski --- drivers/dma/sh/shdmac.c | 9 +++++++++ include/linux/sh_dma.h | 21 --------------------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index 7a01faa..4412cad 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c @@ -37,6 +37,15 @@ #include "../dmaengine.h" #include "shdma.h" +/* DMA register */ +#define SAR 0x00 +#define DAR 0x04 +#define TCR 0x08 +#define CHCR 0x0C +#define DMAOR 0x40 + +#define TEND 0x18 /* USB-DMAC */ + #define SH_DMAE_DRV_NAME "sh-dma-engine" /* Default MEMCPY transfer size = 2^2 = 4 bytes */ diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h index 776ed9d..b7b43b8 100644 --- a/include/linux/sh_dma.h +++ b/include/linux/sh_dma.h @@ -94,39 +94,18 @@ struct sh_dmae_pdata { unsigned int slave_only:1; }; -/* DMA register */ -#define SAR 0x00 -#define DAR 0x04 -#define TCR 0x08 -#define CHCR 0x0C -#define DMAOR 0x40 - -#define TEND 0x18 /* USB-DMAC */ - /* DMAOR definitions */ #define DMAOR_AE 0x00000004 #define DMAOR_NMIF 0x00000002 #define DMAOR_DME 0x00000001 /* Definitions for the SuperH DMAC */ -#define REQ_L 0x00000000 -#define REQ_E 0x00080000 -#define RACK_H 0x00000000 -#define RACK_L 0x00040000 -#define ACK_R 0x00000000 -#define ACK_W 0x00020000 -#define ACK_H 0x00000000 -#define ACK_L 0x00010000 #define DM_INC 0x00004000 #define DM_DEC 0x00008000 #define DM_FIX 0x0000c000 #define SM_INC 0x00001000 #define SM_DEC 0x00002000 #define SM_FIX 0x00003000 -#define RS_IN 0x00000200 -#define RS_OUT 0x00000300 -#define TS_BLK 0x00000040 -#define TM_BUR 0x00000020 #define CHCR_DE 0x00000001 #define CHCR_TE 0x00000002 #define CHCR_IE 0x00000004