gpio: sx150x: use devm_kzalloc()
PATCH 1/1 gpio: sx150x: use devm_kzalloc()
Use devm_kzalloc() to make cleanup paths simpler.
Signed-off-by Nikolay Balandin <[email protected]>
--- drivers/gpio/gpio-sx150x.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/gpio/gpio-sx150x.c +5 -6
@@ -591,18 +591,19 @@ static int sx150x_probe(struct i2c_client *client,if (!i2c_check_functionality (client->adapter, i2c_funcs))return -ENOSYS ; - chip =kzalloc (sizeof (struct sx150x_chip ),GFP_KERNEL ); + chip =devm_kzalloc (&client->dev, +sizeof (struct sx150x_chip ),GFP_KERNEL );if (!chip)return -ENOMEM ;sx150x_init_chip (chip, client, id->driver_data, pdata); rc =sx150x_init_hw (chip, pdata);if (rc <0 ) - goto probe_fail_pre_gpiochip_add; +return rc; rc =gpiochip_add (&chip->gpio_chip); -if (rc <0 ) - goto probe_fail_pre_gpiochip_add; +if (rc) +return rc;if (pdata->irq_summary >=0 ) { rc = sx150x_install_irq_chip(chip,
@@ -617,8 +618,6 @@ static int sx150x_probe(struct i2c_client *client,return 0 ; probe_fail_post_gpiochip_add:WARN_ON (gpiochip_remove (&chip->gpio_chip) <0 ); -probe_fail_pre_gpiochip_add: -kfree (chip);return rc; }
Signature · 1 line
1.7.9.5
Quoted 3 lines · Nikolay Balandin
Use
devm_kzalloc()to make cleanup paths simpler.Signed-off-by Nikolay Balandin <[email protected]>
You forgot to remove the kfree(chip); in sx150x_remove().
Yours,
Linus Walleij