Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751701Ab1CaEFB (ORCPT ); Thu, 31 Mar 2011 00:05:01 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:62778 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750787Ab1CaEE7 (ORCPT ); Thu, 31 Mar 2011 00:04:59 -0400 Date: Wed, 30 Mar 2011 22:04:54 -0600 From: Grant Likely To: Ryan Mallon Cc: linux-arm-kernel , linux kernel , hartleys , Thomas Gleixner Subject: Re: [PATCH] EP93xx: Remove ep93xx_gpio_dbg_show function Message-ID: <20110331040454.GH21226@ponder.secretlab.ca> References: <4D9113AA.20404@bluewatersys.com> <20110331040147.GG21226@ponder.secretlab.ca> <4D93FD29.4020104@bluewatersys.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4D93FD29.4020104@bluewatersys.com> 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 Content-Length: 3148 Lines: 88 On Thu, Mar 31, 2011 at 05:03:53PM +1300, Ryan Mallon wrote: > On 03/31/2011 05:01 PM, Grant Likely wrote: > > On Tue, Mar 29, 2011 at 12:03:06PM +1300, Ryan Mallon wrote: > >> Hartley pointed out that the patch I posted to remove the irq internals > >> fiddling from ep93xx_gpio_dbg_show does not function as expected. It > >> will print [interrupt] beside all pins which are capable of being > >> interrupts, not just those which are currently configured as interrupts. > >> > >> The best solution is just to remove the custom ep93xx gpio debugfs > >> function all together. The generic gpiolib one is good enough. > >> > >> Signed-off-by: Ryan Mallon > > > > Applied, thanks. > > > > g. > > This is presently sitting in rmk's patch tracking system. I take it I > should drop it from there? Actually, no. I missed it was under arch/arm instead of drivers/gpio. I'll drop it from my tree. g. > > ~Ryan > > >> --- > >> > >> diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c > >> index 34e071d..c74adf9 100644 > >> --- a/arch/arm/mach-ep93xx/gpio.c > >> +++ b/arch/arm/mach-ep93xx/gpio.c > >> @@ -348,29 +348,6 @@ static int ep93xx_gpio_set_debounce(struct gpio_chip *chip, > >> return 0; > >> } > >> > >> -static void ep93xx_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) > >> -{ > >> - struct ep93xx_gpio_chip *ep93xx_chip = to_ep93xx_gpio_chip(chip); > >> - u8 data_reg, data_dir_reg; > >> - int gpio, i; > >> - > >> - data_reg = __raw_readb(ep93xx_chip->data_reg); > >> - data_dir_reg = __raw_readb(ep93xx_chip->data_dir_reg); > >> - > >> - gpio = ep93xx_chip->chip.base; > >> - for (i = 0; i < chip->ngpio; i++, gpio++) { > >> - int is_out = data_dir_reg & (1 << i); > >> - int irq = gpio_to_irq(gpio); > >> - > >> - seq_printf(s, " %s%d gpio-%-3d (%-12s) %s %s %s\n", > >> - chip->label, i, gpio, > >> - gpiochip_is_requested(chip, i) ? : "", > >> - is_out ? "out" : "in ", > >> - (data_reg & (1<< i)) ? "hi" : "lo", > >> - (!is_out && irq>= 0) ? "(interrupt)" : ""); > >> - } > >> -} > >> - > >> #define EP93XX_GPIO_BANK(name, dr, ddr, base_gpio) \ > >> { \ > >> .chip = { \ > >> @@ -379,7 +356,6 @@ static void ep93xx_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) > >> .direction_output = ep93xx_gpio_direction_output, \ > >> .get = ep93xx_gpio_get, \ > >> .set = ep93xx_gpio_set, \ > >> - .dbg_show = ep93xx_gpio_dbg_show, \ > >> .base = base_gpio, \ > >> .ngpio = 8, \ > >> }, \ > >> > > > -- > Bluewater Systems Ltd - ARM Technology Solution Centre > > Ryan Mallon 5 Amuri Park, 404 Barbadoes St > ryan@bluewatersys.com PO Box 13 889, Christchurch 8013 > http://www.bluewatersys.com New Zealand > Phone: +64 3 3779127 Freecall: Australia 1800 148 751 > Fax: +64 3 3779135 USA 1800 261 2934 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/