Skip to content

Commit

Permalink
gpio/microblaze: Eliminate duplication of of_get_named_gpio_flags()
Browse files Browse the repository at this point in the history
of_reset_gpio_handle() is largely a cut-and-paste copy of
of_get_named_gpio_flags(). There really isn't any reason for the
split, so this patch deletes the duplicate function

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Michal Simek <monstr@monstr.eu>
  • Loading branch information
Grant Likely committed Dec 12, 2011
1 parent 64842aa commit fe9f684
Showing 1 changed file with 2 additions and 41 deletions.
43 changes: 2 additions & 41 deletions arch/microblaze/kernel/reset.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,50 +19,11 @@
static int handle; /* reset pin handle */
static unsigned int reset_val;

static int of_reset_gpio_handle(void)
{
int ret; /* variable which stored handle reset gpio pin */
struct device_node *root; /* root node */
struct device_node *gpio; /* gpio node */
struct gpio_chip *gc;
u32 flags;
const void *gpio_spec;

/* find out root node */
root = of_find_node_by_path("/");

/* give me handle for gpio node to be possible allocate pin */
ret = of_parse_phandles_with_args(root, "hard-reset-gpios",
"#gpio-cells", 0, &gpio, &gpio_spec);
if (ret) {
pr_debug("%s: can't parse gpios property\n", __func__);
goto err0;
}

gc = of_node_to_gpiochip(gpio);
if (!gc) {
pr_debug("%s: gpio controller %s isn't registered\n",
root->full_name, gpio->full_name);
ret = -ENODEV;
goto err1;
}

ret = gc->of_xlate(gc, root, gpio_spec, &flags);
if (ret < 0)
goto err1;

ret += gc->base;
err1:
of_node_put(gpio);
err0:
pr_debug("%s exited with status %d\n", __func__, ret);
return ret;
}

void of_platform_reset_gpio_probe(void)
{
int ret;
handle = of_reset_gpio_handle();
handle = of_get_named_gpio(of_find_node_by_path("/"),
"hard-reset-gpios", 0);

if (!gpio_is_valid(handle)) {
printk(KERN_INFO "Skipping unavailable RESET gpio %d (%s)\n",
Expand Down

0 comments on commit fe9f684

Please sign in to comment.