Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d037b039 authored by Linus Walleij's avatar Linus Walleij Committed by Greg Kroah-Hartman
Browse files

gpio: mxs: Get rid of external API call 



[ Upstream commit 833eacc7b5913da9896bacd30db7d490aa777868 ]

The MXS driver was calling back into the GPIO API from
its irqchip. This is not very elegant, as we are a driver,
let's just shortcut back into the gpio_chip .get() function
instead.

This is a tricky case since the .get() callback is not in
this file, instead assigned by bgpio_init(). Calling the
function direcly in the gpio_chip is however the lesser
evil.

Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Janusz Uzycki <j.uzycki@elproma.com.pl>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 085d6959

drivers/gpio/gpio-mxs.c

+1 −3
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/gpio/driver.h>

/* FIXME: for gpio_get_value(), replace this by direct register read */

#include <linux/gpio.h>

#include <linux/module.h>



#define MXS_SET		0x4
@@ -86,7 +84,7 @@ static int mxs_gpio_set_irq_type(struct irq_data *d, unsigned int type) 
	port->both_edges &= ~pin_mask;

	switch (type) {

	case IRQ_TYPE_EDGE_BOTH:

		val = gpio_get_value(port->gc.base + d->hwirq);

		val = port->gc.get(&port->gc, d->hwirq);

		if (val)

			edge = GPIO_INT_FALL_EDGE;

		else