leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

leds: leds-ns2: use devm_gpio_request_one

Browse Source 
devm_gpio_request_one is device managed and makes error handling
and cleanup simpler.

Cc: Simon Guinot <sguinot@lacie.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
This commit is contained in:
Sachin Kamat
2012-11-25 10:28:10 +05:30
committed by Bryan Wu
parent 95a8ff8356
commit 04195823aa
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/leds/leds-ns2.c
View File

@@ -191,7 +191,7 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
int ret; int ret;
enum ns2_led_modes mode; enum ns2_led_modes mode;
ret = gpio_request_one(template->cmd, ret = devm_gpio_request_one(&pdev->dev, template->cmd,
GPIOF_DIR_OUT | gpio_get_value(template->cmd), GPIOF_DIR_OUT | gpio_get_value(template->cmd),
template->name); template->name);
if (ret) { if (ret) {
@@ -200,13 +200,13 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
return ret; return ret;
} }
ret = gpio_request_one(template->slow, ret = devm_gpio_request_one(&pdev->dev, template->slow,
GPIOF_DIR_OUT | gpio_get_value(template->slow), GPIOF_DIR_OUT | gpio_get_value(template->slow),
template->name); template->name);
if (ret) { if (ret) {
dev_err(&pdev->dev, "%s: failed to setup slow GPIO\n", dev_err(&pdev->dev, "%s: failed to setup slow GPIO\n",
template->name); template->name);
goto err_free_cmd; return ret;
} }
rwlock_init(&led_dat->rw_lock); rwlock_init(&led_dat->rw_lock);
@@ -221,7 +221,7 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
ret = ns2_led_get_mode(led_dat, &mode); ret = ns2_led_get_mode(led_dat, &mode);
if (ret < 0) if (ret < 0)
goto err_free_slow; return ret;
/* Set LED initial state. */ /* Set LED initial state. */
led_dat->sata = (mode == NS_V2_LED_SATA) ? 1 : 0; led_dat->sata = (mode == NS_V2_LED_SATA) ? 1 : 0;
@@ -230,7 +230,7 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
ret = led_classdev_register(&pdev->dev, &led_dat->cdev); ret = led_classdev_register(&pdev->dev, &led_dat->cdev);
if (ret < 0) if (ret < 0)
goto err_free_slow; return ret;
ret = device_create_file(led_dat->cdev.dev, &dev_attr_sata); ret = device_create_file(led_dat->cdev.dev, &dev_attr_sata);
if (ret < 0) if (ret < 0)
@@ -240,11 +240,6 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
err_free_cdev: err_free_cdev:
led_classdev_unregister(&led_dat->cdev); led_classdev_unregister(&led_dat->cdev);
err_free_slow:
gpio_free(led_dat->slow);
err_free_cmd:
gpio_free(led_dat->cmd);
return ret; return ret;
} }
@@ -252,8 +247,6 @@ static void delete_ns2_led(struct ns2_led_data *led_dat)
{ {
device_remove_file(led_dat->cdev.dev, &dev_attr_sata); device_remove_file(led_dat->cdev.dev, &dev_attr_sata);
led_classdev_unregister(&led_dat->cdev); led_classdev_unregister(&led_dat->cdev);
gpio_free(led_dat->cmd);
gpio_free(led_dat->slow);
} }
static int __devinit ns2_led_probe(struct platform_device *pdev) static int __devinit ns2_led_probe(struct platform_device *pdev)