From patchwork Sun Jun 5 15:59:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 849902 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p55Fq1kc001699 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 5 Jun 2011 15:52:22 GMT Received: from canuck.infradead.org ([134.117.69.58]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QTFcF-0002ut-RK; Sun, 05 Jun 2011 15:51:52 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QTFcE-0000Aq-Qo; Sun, 05 Jun 2011 15:51:50 +0000 Received: from mail-pz0-f49.google.com ([209.85.210.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QTFbx-000075-9e for linux-arm-kernel@lists.infradead.org; Sun, 05 Jun 2011 15:51:34 +0000 Received: by pzk28 with SMTP id 28so2186616pzk.36 for ; Sun, 05 Jun 2011 08:51:31 -0700 (PDT) Received: by 10.68.69.105 with SMTP id d9mr1444959pbu.455.1307289091547; Sun, 05 Jun 2011 08:51:31 -0700 (PDT) Received: from localhost.localdomain ([117.80.114.155]) by mx.google.com with ESMTPS id y2sm3012516pbi.67.2011.06.05.08.51.18 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Jun 2011 08:51:30 -0700 (PDT) From: Shawn Guo To: linux-kernel@vger.kernel.org Subject: [PATCH v4 3/3] gpio/mxs: Remove the use of gpio-mxs.h Date: Sun, 5 Jun 2011 23:59:05 +0800 Message-Id: <1307289545-6993-4-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1307289545-6993-1-git-send-email-shawn.guo@linaro.org> References: <1307289545-6993-1-git-send-email-shawn.guo@linaro.org> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110605_115133_556332_A3479457 X-CRM114-Status: GOOD ( 17.29 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.49 listed in list.dnswl.org] Cc: arnd@arndb.de, patches@linaro.org, grant.likely@secretlab.ca, kernel@pengutronix.de, Shawn Guo , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sun, 05 Jun 2011 15:52:22 +0000 (UTC) The patch moves "struct mxs_gpio_port" into gpio-mxs.c, as it needs not to be public at all. And then the header arch/arm/mach-mxs/include/mach/gpio-mxs.h can be deleted. Signed-off-by: Shawn Guo --- arch/arm/mach-mxs/include/mach/gpio-mxs.h | 34 ----------------------------- drivers/gpio/gpio-mxs.c | 10 +++++++- 2 files changed, 9 insertions(+), 35 deletions(-) delete mode 100644 arch/arm/mach-mxs/include/mach/gpio-mxs.h diff --git a/arch/arm/mach-mxs/include/mach/gpio-mxs.h b/arch/arm/mach-mxs/include/mach/gpio-mxs.h deleted file mode 100644 index 005bb06..0000000 --- a/arch/arm/mach-mxs/include/mach/gpio-mxs.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2007 Freescale Semiconductor, Inc. All Rights Reserved. - * Copyright 2008 Juergen Beisert, kernel@pengutronix.de - * - * 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. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ - -#ifndef __MXS_GPIO_H__ -#define __MXS_GPIO_H__ - -struct mxs_gpio_port { - void __iomem *base; - int id; - int irq; - int irq_high; - int virtual_irq_start; - struct gpio_chip chip; -}; - -int mxs_gpio_init(struct mxs_gpio_port*, int); - -#endif /* __MXS_GPIO_H__ */ diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c index 6fd9f01..a287614 100644 --- a/drivers/gpio/gpio-mxs.c +++ b/drivers/gpio/gpio-mxs.c @@ -28,7 +28,6 @@ #include #include #include -#include #define MXS_SET 0x4 #define MXS_CLR 0x8 @@ -49,6 +48,15 @@ #define GPIO_INT_LEV_MASK (1 << 0) #define GPIO_INT_POL_MASK (1 << 1) +struct mxs_gpio_port { + void __iomem *base; + int id; + int irq; + int irq_high; + int virtual_irq_start; + struct gpio_chip chip; +}; + /* Note: This driver assumes 32 GPIOs are handled in one register */ static void clear_gpio_irqstatus(struct mxs_gpio_port *port, u32 index)