lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

w1-gpio: Use devm_* functions

Browse Source 
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Markus Pargmann
2013-10-29 09:19:24 +01:00
committed by Greg Kroah-Hartman
parent 7cf1a122b2
commit d27f25c9c2
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/w1/masters/w1-gpio.c
View File

@@ -99,25 +99,27 @@ static int w1_gpio_probe(struct platform_device *pdev)
return -ENXIO; return -ENXIO;
} }
master = kzalloc(sizeof(struct w1_bus_master), GFP_KERNEL); master = devm_kzalloc(&pdev->dev, sizeof(struct w1_bus_master),
GFP_KERNEL);
if (!master) { if (!master) {
dev_err(&pdev->dev, "Out of memory\n"); dev_err(&pdev->dev, "Out of memory\n");
return -ENOMEM; return -ENOMEM;
} }
err = gpio_request(pdata->pin, "w1"); err = devm_gpio_request(&pdev->dev, pdata->pin, "w1");
if (err) { if (err) {
dev_err(&pdev->dev, "gpio_request (pin) failed\n"); dev_err(&pdev->dev, "gpio_request (pin) failed\n");
goto free_master; return err;
} }
if (gpio_is_valid(pdata->ext_pullup_enable_pin)) { if (gpio_is_valid(pdata->ext_pullup_enable_pin)) {
err = gpio_request_one(pdata->ext_pullup_enable_pin, err = devm_gpio_request_one(&pdev->dev,
GPIOF_INIT_LOW, "w1 pullup"); pdata->ext_pullup_enable_pin, GPIOF_INIT_LOW,
"w1 pullup");
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, "gpio_request_one " dev_err(&pdev->dev, "gpio_request_one "
"(ext_pullup_enable_pin) failed\n"); "(ext_pullup_enable_pin) failed\n");
goto free_gpio; return err;
} }
} }
@@ -135,7 +137,7 @@ static int w1_gpio_probe(struct platform_device *pdev)
err = w1_add_master_device(master); err = w1_add_master_device(master);
if (err) { if (err) {
dev_err(&pdev->dev, "w1_add_master device failed\n"); dev_err(&pdev->dev, "w1_add_master device failed\n");
goto free_gpio_ext_pu; return err;
} }
if (pdata->enable_external_pullup) if (pdata->enable_external_pullup)
@@ -147,16 +149,6 @@ static int w1_gpio_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, master); platform_set_drvdata(pdev, master);
return 0; return 0;
free_gpio_ext_pu:
if (gpio_is_valid(pdata->ext_pullup_enable_pin))
gpio_free(pdata->ext_pullup_enable_pin);
free_gpio:
gpio_free(pdata->pin);
free_master:
kfree(master);
return err;
} }
static int w1_gpio_remove(struct platform_device *pdev) static int w1_gpio_remove(struct platform_device *pdev)
@@ -171,8 +163,6 @@ static int w1_gpio_remove(struct platform_device *pdev)
gpio_set_value(pdata->ext_pullup_enable_pin, 0); gpio_set_value(pdata->ext_pullup_enable_pin, 0);
w1_remove_master_device(master); w1_remove_master_device(master);
gpio_free(pdata->pin);
kfree(master);
return 0; return 0;
} }