OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gpio: of: provide optional of_mm_gpiochip_add_data() function

Browse Source 
In the same spirit as we add an optional void *data argument
to the gpiochip_add_data() call, we need this also for
of_mm_gpiochip_add().

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-04 15:13:53 +01:00
parent b08ea35a32
commit 3208b0f0c0
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpio/gpiolib-of.c
View File

@ -262,9 +262,10 @@ int of_gpio_simple_xlate(struct gpio_chip *gc,
EXPORT_SYMBOL(of_gpio_simple_xlate); EXPORT_SYMBOL(of_gpio_simple_xlate);
/** /**
* of_mm_gpiochip_add - Add memory mapped GPIO chip (bank) * of_mm_gpiochip_add_data - Add memory mapped GPIO chip (bank)
* @np: device node of the GPIO chip * @np: device node of the GPIO chip
* @mm_gc: pointer to the of_mm_gpio_chip allocated structure * @mm_gc: pointer to the of_mm_gpio_chip allocated structure
* @data: driver data to store in the struct gpio_chip
* *
* To use this function you should allocate and fill mm_gc with: * To use this function you should allocate and fill mm_gc with:
* *
@ -280,8 +281,9 @@ EXPORT_SYMBOL(of_gpio_simple_xlate);
* do all necessary work for you. Then you'll able to use .regs * do all necessary work for you. Then you'll able to use .regs
* to manage GPIOs from the callbacks. * to manage GPIOs from the callbacks.
*/ */
int of_mm_gpiochip_add(struct device_node *np, int of_mm_gpiochip_add_data(struct device_node *np,
struct of_mm_gpio_chip *mm_gc) struct of_mm_gpio_chip *mm_gc,
void *data)
{ {
int ret = -ENOMEM; int ret = -ENOMEM;
struct gpio_chip *gc = &mm_gc->gc; struct gpio_chip *gc = &mm_gc->gc;
@ -301,7 +303,7 @@ int of_mm_gpiochip_add(struct device_node *np,
mm_gc->gc.of_node = np; mm_gc->gc.of_node = np;
ret = gpiochip_add(gc); ret = gpiochip_add_data(gc, data);
if (ret) if (ret)
goto err2; goto err2;
@ -315,7 +317,7 @@ err0:
np->full_name, ret); np->full_name, ret);
return ret; return ret;
} }
EXPORT_SYMBOL(of_mm_gpiochip_add); EXPORT_SYMBOL(of_mm_gpiochip_add_data);
/** /**
* of_mm_gpiochip_remove - Remove memory mapped GPIO chip (bank) * of_mm_gpiochip_remove - Remove memory mapped GPIO chip (bank)

10
include/linux/of_gpio.h
View File

@ -51,8 +51,14 @@ static inline struct of_mm_gpio_chip *to_of_mm_gpio_chip(struct gpio_chip *gc)
extern int of_get_named_gpio_flags(struct device_node *np, extern int of_get_named_gpio_flags(struct device_node *np,
const char *list_name, int index, enum of_gpio_flags *flags); const char *list_name, int index, enum of_gpio_flags *flags);
extern int of_mm_gpiochip_add(struct device_node *np, extern int of_mm_gpiochip_add_data(struct device_node *np,
struct of_mm_gpio_chip *mm_gc); struct of_mm_gpio_chip *mm_gc,
void *data);
static inline int of_mm_gpiochip_add(struct device_node *np,
struct of_mm_gpio_chip *mm_gc)
{
return of_mm_gpiochip_add_data(np, mm_gc, NULL);
}
extern void of_mm_gpiochip_remove(struct of_mm_gpio_chip *mm_gc); extern void of_mm_gpiochip_remove(struct of_mm_gpio_chip *mm_gc);
extern int of_gpiochip_add(struct gpio_chip *gc); extern int of_gpiochip_add(struct gpio_chip *gc);