From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756856Ab1FFHms (ORCPT ); Mon, 6 Jun 2011 03:42:48 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:40626 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755115Ab1FFHmn (ORCPT ); Mon, 6 Jun 2011 03:42:43 -0400 Date: Mon, 6 Jun 2011 01:42:42 -0600 From: Grant Likely To: Shawn Guo Cc: linux-kernel@vger.kernel.org, arnd@arndb.de, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org, patches@linaro.org Subject: Re: [PATCH v4 3/3] gpio/mxs: Remove the use of gpio-mxs.h Message-ID: <20110606074242.GA10410@ponder.secretlab.ca> References: <1307289545-6993-1-git-send-email-shawn.guo@linaro.org> <1307289545-6993-4-git-send-email-shawn.guo@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1307289545-6993-4-git-send-email-shawn.guo@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Jun 05, 2011 at 11:59:05PM +0800, Shawn Guo wrote: > 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 $ git grep mach/gpio-mxs.h arch/arm/mach-mxs/mach-mx28evk.c:#include You missed removing an include. I fixed it up. In fact, now that I see that mach-mx28evk.h doesn't actually use anything in that file, I've squashed patch 1 & 3 together. Applied, thanks. g. > > 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) > -- > 1.7.4.1 >