Skip to content

Commit

Permalink
gpio: pcf857x: use devm_kzalloc()
Browse files Browse the repository at this point in the history
Use devm_kzalloc() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Jingoo Han authored and Linus Walleij committed Mar 27, 2013
1 parent 632d8e5 commit f39f54a
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/gpio/gpio-pcf857x.c
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ static int pcf857x_probe(struct i2c_client *client,
}

/* Allocate, initialize, and register this gpio_chip. */
gpio = kzalloc(sizeof *gpio, GFP_KERNEL);
gpio = devm_kzalloc(&client->dev, sizeof(*gpio), GFP_KERNEL);
if (!gpio)
return -ENOMEM;

Expand Down Expand Up @@ -391,7 +391,6 @@ static int pcf857x_probe(struct i2c_client *client,
if (pdata && client->irq)
pcf857x_irq_domain_cleanup(gpio);

kfree(gpio);
return status;
}

Expand All @@ -416,9 +415,7 @@ static int pcf857x_remove(struct i2c_client *client)
pcf857x_irq_domain_cleanup(gpio);

status = gpiochip_remove(&gpio->chip);
if (status == 0)
kfree(gpio);
else
if (status)
dev_err(&client->dev, "%s --> %d\n", "remove", status);
return status;
}
Expand Down

0 comments on commit f39f54a

Please sign in to comment.