[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20100521112437.1efc88a2@dxy2>
Date: Fri, 21 May 2010 11:24:37 +0800
From: "Du, Alek" <alek.du@...el.com>
To: Andrew Morton <akpm@...ux-foundation.org>
CC: David Brownell <david-b@...bell.net>,
Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] gpio: add Penwell gpio support
On Fri, 21 May 2010 05:28:21 +0800
Andrew Morton <akpm@...ux-foundation.org> wrote:
> On Tue, 18 May 2010 15:40:25 +0800
> "Du, Alek" <alek.du@...el.com> wrote:
>
> > >From 963f6e83843b0f94f8a5337def6e897ec5bb99bf Mon Sep 17 00:00:00 2001
> > From: Alek Du <alek.du@...el.com>
> > Date: Thu, 25 Feb 2010 14:32:46 +0800
> > Subject: [PATCH] gpio: add Penwell gpio support
> >
> > Intel Penwell chip has two 96 pins GPIO blocks, which are very similiar as
> > Intel Langwell chip GPIO block, except for pin number difference. This
> > patch expends the original Langwell GPIO driver to support Penwell's.
> >
>
> Has the driver been retested on Moorestown?
Yes, retested with Moorestown platform.
>
> > -static int lnw_gpio_get(struct gpio_chip *chip, unsigned offset)
> > +static inline void __iomem *gpio_reg(struct gpio_chip *chip, unsigned offset,
> > + enum GPIO_REG reg_type)
> > {
> > struct lnw_gpio *lnw = container_of(chip, struct lnw_gpio, chip);
> > + unsigned nreg = chip->ngpio / 32;
> > u8 reg = offset / 32;
> > - void __iomem *gplr;
> > + void __iomem *ptr;
> > +
> > + ptr = (void __iomem *)(lnw->reg_base + reg_type * nreg * 4 + reg * 4);
> > + return ptr;
> > +}
>
> inlining this function was probably the wrong thing to do. But modern
> gcc's often just ignore the `inline' and do the right thing anyway.
>
Yes, as I looked at the assembly code, the function is too big. I should remove "inline".
>
> > -static struct pci_device_id lnw_gpio_ids[] = {
> > - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080f) },
> > +static struct pci_device_id lnw_gpio_ids[] = { /* pin number */
> > + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080f), .driver_data = 64 },
> > + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081f), .driver_data = 96 },
> > + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081a), .driver_data = 96 },
> > { 0, }
>
> I suppose we should be using DEFINE_PCI_DEVICE_TABLE() here.
>
>
Yes, here is the incremental patch against previous one (I got the mail said
the previous one is in mm tree now):
>From 47b561649890807a1a66fd8c4b07ded87df485c2 Mon Sep 17 00:00:00 2001
From: Alek Du <alek.du@...el.com>
Date: Fri, 21 May 2010 11:16:40 +0800
Subject: [PATCH] gpio: langwell/penwell gpio driver style fix
* remove gpio_reg inline, due to the fact the func is too big to inline
* use standard DEFINE_PCI_DEVICE_TABLE
Signed-off-by: Alek Du <alek.du@...el.com>
---
drivers/gpio/langwell_gpio.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpio/langwell_gpio.c b/drivers/gpio/langwell_gpio.c
index 0693f71..8383a8d 100644
--- a/drivers/gpio/langwell_gpio.c
+++ b/drivers/gpio/langwell_gpio.c
@@ -63,7 +63,7 @@ struct lnw_gpio {
unsigned irq_base;
};
-static inline void __iomem *gpio_reg(struct gpio_chip *chip, unsigned offset,
+static void __iomem *gpio_reg(struct gpio_chip *chip, unsigned offset,
enum GPIO_REG reg_type)
{
struct lnw_gpio *lnw = container_of(chip, struct lnw_gpio, chip);
@@ -175,7 +175,7 @@ static struct irq_chip lnw_irqchip = {
.set_type = lnw_irq_type,
};
-static struct pci_device_id lnw_gpio_ids[] = { /* pin number */
+static DEFINE_PCI_DEVICE_TABLE(lnw_gpio_ids) = { /* pin number */
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080f), .driver_data = 64 },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081f), .driver_data = 96 },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081a), .driver_data = 96 },
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists