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: 1745 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:55:18 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs98962vdc; Sun, 5 Jun 2011 08:51:32 -0700 (PDT) Received: by 10.42.145.200 with SMTP id g8mr6502607icv.4.1307289092007; Sun, 05 Jun 2011 08:51:32 -0700 (PDT) Received: from mail-pz0-f50.google.com (mail-pz0-f50.google.com [209.85.210.50]) by mx.google.com with ESMTPS id z6si23482923icw.36.2011.06.05.08.51.31 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Jun 2011 08:51:32 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.210.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by mail-pz0-f50.google.com with SMTP id 2so1700204pzk.37 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 Cc: grant.likely@secretlab.ca, arnd@arndb.de, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org, patches@linaro.org, Shawn Guo 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> 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)