From e47c935747f9fca5d0bc66e4e7bf0728838ca62e Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 13 Jun 2011 10:47:15 +0200 Subject: [PATCH] --- yaml --- r: 256695 b: refs/heads/master c: 12610be33df5563d3f8cb141f231d4dc5b2a317f h: refs/heads/master i: 256693: f52ecc48b003488618c4d6d7445f99ecb025ae52 256691: 7e1e2bf554eb7017361e751c1d27ee1d29853acd 256687: cc0e073bb8b1f92e7ee8335e48c88df8a59fe020 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-74x164.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 213c44a0d38e..d9f524a1102c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5523f86beab2b87d42cd58aca9bd5cee5466c6e3 +refs/heads/master: 12610be33df5563d3f8cb141f231d4dc5b2a317f diff --git a/trunk/drivers/gpio/gpio-74x164.c b/trunk/drivers/gpio/gpio-74x164.c index 7fb60b6bf523..ff525c0958dd 100644 --- a/trunk/drivers/gpio/gpio-74x164.c +++ b/trunk/drivers/gpio/gpio-74x164.c @@ -23,7 +23,7 @@ struct gen_74x164_chip { u8 port_config; }; -static struct gen_74x164_chip *gpio_to_chip(struct gpio_chip *gc) +static struct gen_74x164_chip *gpio_to_74x164_chip(struct gpio_chip *gc) { return container_of(gc, struct gen_74x164_chip, gpio_chip); } @@ -36,7 +36,7 @@ static int __gen_74x164_write_config(struct gen_74x164_chip *chip) static int gen_74x164_get_value(struct gpio_chip *gc, unsigned offset) { - struct gen_74x164_chip *chip = gpio_to_chip(gc); + struct gen_74x164_chip *chip = gpio_to_74x164_chip(gc); int ret; mutex_lock(&chip->lock); @@ -49,7 +49,7 @@ static int gen_74x164_get_value(struct gpio_chip *gc, unsigned offset) static void gen_74x164_set_value(struct gpio_chip *gc, unsigned offset, int val) { - struct gen_74x164_chip *chip = gpio_to_chip(gc); + struct gen_74x164_chip *chip = gpio_to_74x164_chip(gc); mutex_lock(&chip->lock); if (val)