aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-davinci.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-07-12 19:18:56 -0400
committerThomas Gleixner <tglx@linutronix.de>2015-07-14 06:12:21 -0400
commit1765d671b18e58fdd6341edac9c22e57d90ef6a8 (patch)
treec2e4c00b6d7e47009f59fce133198066019d6984 /drivers/gpio/gpio-davinci.c
parent789f9dabfe44c1f7056aa0a7c9a9205de4d5261f (diff)
gpio/davinci: Avoid redundant lookup of irq_data
It's pretty silly to do void *cd = irq_get_chip_data(irq_data->irq); because that results in cd = irq_data->chip_data, but goes through a redundant lookup of the irq_data. Use irq_data directly. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Alexandre Courbot <gnurou@gmail.com> Cc: Jiang Liu <jiang.liu@linux.intel.com> Cc: linux-gpio@vger.kernel.org
Diffstat (limited to 'drivers/gpio/gpio-davinci.c')
-rw-r--r--drivers/gpio/gpio-davinci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index 9a738f5d409b..d885d98fe161 100644
--- a/drivers/gpio/gpio-davinci.c
+++ b/drivers/gpio/gpio-davinci.c
@@ -65,11 +65,11 @@ static struct davinci_gpio_regs __iomem *gpio2regs(unsigned gpio)
65 return ptr; 65 return ptr;
66} 66}
67 67
68static inline struct davinci_gpio_regs __iomem *irq2regs(int irq) 68static inline struct davinci_gpio_regs __iomem *irq2regs(struct irq_data *d)
69{ 69{
70 struct davinci_gpio_regs __iomem *g; 70 struct davinci_gpio_regs __iomem *g;
71 71
72 g = (__force struct davinci_gpio_regs __iomem *)irq_get_chip_data(irq); 72 g = (__force struct davinci_gpio_regs __iomem *)irq_data_get_irq_chip_data(d);
73 73
74 return g; 74 return g;
75} 75}
@@ -287,7 +287,7 @@ static int davinci_gpio_probe(struct platform_device *pdev)
287 287
288static void gpio_irq_disable(struct irq_data *d) 288static void gpio_irq_disable(struct irq_data *d)
289{ 289{
290 struct davinci_gpio_regs __iomem *g = irq2regs(d->irq); 290 struct davinci_gpio_regs __iomem *g = irq2regs(d);
291 u32 mask = (u32) irq_data_get_irq_handler_data(d); 291 u32 mask = (u32) irq_data_get_irq_handler_data(d);
292 292
293 writel_relaxed(mask, &g->clr_falling); 293 writel_relaxed(mask, &g->clr_falling);
@@ -296,7 +296,7 @@ static void gpio_irq_disable(struct irq_data *d)
296 296
297static void gpio_irq_enable(struct irq_data *d) 297static void gpio_irq_enable(struct irq_data *d)
298{ 298{
299 struct davinci_gpio_regs __iomem *g = irq2regs(d->irq); 299 struct davinci_gpio_regs __iomem *g = irq2regs(d);
300 u32 mask = (u32) irq_data_get_irq_handler_data(d); 300 u32 mask = (u32) irq_data_get_irq_handler_data(d);
301 unsigned status = irqd_get_trigger_type(d); 301 unsigned status = irqd_get_trigger_type(d);
302 302