From patchwork Tue Oct 1 08:48:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 20713 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 31D6723920 for ; Tue, 1 Oct 2013 08:49:11 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id a41sf7348278yho.2 for ; Tue, 01 Oct 2013 01:49:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=2VQGkHU1HnueNh5zoZ5CfYfYEpZXA49bGtot7w5jUdE=; b=I0BSxkS5v4pBjWSzvIdXfMEvgvmwnvwzGbvXkmrFczMMxJbrEzEvlQthZQ59qYcrz2 l1z3h9AZM0CXY0cTHrZpHKUNfWRX931C12irzOOHnMt30FDc6u9AlCCq9naB5BB/4U/Q GY0fWItBd7DZcF11HtzM390gw2UC3tXQruHOwXdJjxyaWEzp6Kr6H/gLz4a1ef1BEoLX M7yTETDmI7nmkUFPnXX9MTGQfeU6ekYJCwceXeJkeTjT1cu9UsFq5oKwTwV0iWQ6F/W4 /Y3JE+SnssPT9U0Qc4WYorzqukzA2CXkDLE7zZ3e/hwYcgsJWd2nlzMhPQMM3fyspdu3 QJXw== X-Received: by 10.236.4.69 with SMTP id 45mr7879659yhi.20.1380617351667; Tue, 01 Oct 2013 01:49:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.6.73 with SMTP id y9ls2421155qey.60.gmail; Tue, 01 Oct 2013 01:49:11 -0700 (PDT) X-Received: by 10.58.235.193 with SMTP id uo1mr26436666vec.6.1380617351547; Tue, 01 Oct 2013 01:49:11 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id un5si1097346vcb.22.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Oct 2013 01:49:11 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id ld13so4507312vcb.25 for ; Tue, 01 Oct 2013 01:49:11 -0700 (PDT) X-Gm-Message-State: ALoCoQkP7b6rKa1MHNwjjDuqP5IDroGRwk3/chW+dYemrqTH9unZJH5QwXBfp++A+1hKW5yvuILF X-Received: by 10.58.208.130 with SMTP id me2mr26759271vec.13.1380617351442; Tue, 01 Oct 2013 01:49:11 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp1879vcz; Tue, 1 Oct 2013 01:49:10 -0700 (PDT) X-Received: by 10.14.184.132 with SMTP id s4mr44978211eem.13.1380617350021; Tue, 01 Oct 2013 01:49:10 -0700 (PDT) Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com [209.85.215.182]) by mx.google.com with ESMTPS id x42si3835826eel.116.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Oct 2013 01:49:09 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.182 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.215.182; Received: by mail-ea0-f182.google.com with SMTP id o10so3283764eaj.27 for ; Tue, 01 Oct 2013 01:49:08 -0700 (PDT) X-Received: by 10.14.183.130 with SMTP id q2mr44820652eem.5.1380617348745; Tue, 01 Oct 2013 01:49:08 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id z12sm10649510eev.6.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 01 Oct 2013 01:49:07 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij , Hans Ulli Kroll Subject: [PATCH] ARM: gemini: delete Date: Tue, 1 Oct 2013 10:48:45 +0200 Message-Id: <1380617325-7477-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The Gemini has no need of a header as this is only used by the machine-local gpio.c gpiochip driver, which is also only using the irq_to_gpio() macro. Delete the file, move the single macro into the driver and remove the NEED_MACH_GPIO_H flag. Cc: Hans Ulli Kroll Signed-off-by: Linus Walleij --- This will be applied to the GPIO tree unless there are protests. --- arch/arm/Kconfig | 1 - arch/arm/mach-gemini/gpio.c | 2 +- arch/arm/mach-gemini/include/mach/gpio.h | 20 -------------------- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 arch/arm/mach-gemini/include/mach/gpio.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3f7714d..b46a078 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -388,7 +388,6 @@ config ARCH_GEMINI select ARCH_REQUIRE_GPIOLIB select ARCH_USES_GETTIMEOFFSET select CPU_FA526 - select NEED_MACH_GPIO_H help Support for the Cortina Systems Gemini family SoCs diff --git a/arch/arm/mach-gemini/gpio.c b/arch/arm/mach-gemini/gpio.c index 70bfa57..f8cb571 100644 --- a/arch/arm/mach-gemini/gpio.c +++ b/arch/arm/mach-gemini/gpio.c @@ -21,9 +21,9 @@ #include #include -#include #define GPIO_BASE(x) IO_ADDRESS(GEMINI_GPIO_BASE(x)) +#define irq_to_gpio(x) ((x) - GPIO_IRQ_BASE) /* GPIO registers definition */ #define GPIO_DATA_OUT 0x0 diff --git a/arch/arm/mach-gemini/include/mach/gpio.h b/arch/arm/mach-gemini/include/mach/gpio.h deleted file mode 100644 index 40a0527..0000000 --- a/arch/arm/mach-gemini/include/mach/gpio.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Gemini gpiolib specific defines - * - * Copyright (C) 2008-2009 Paulius Zaleckas - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef __MACH_GPIO_H__ -#define __MACH_GPIO_H__ - -#include - -#define gpio_to_irq(x) ((x) + GPIO_IRQ_BASE) -#define irq_to_gpio(x) ((x) - GPIO_IRQ_BASE) - -#endif /* __MACH_GPIO_H__ */