forked from Minki/linux
leds: leds-lt3593: use devm_gpio_request_one
devm_gpio_request_one is device managed and makes error handling and cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Bryan Wu <cooloney@gmail.com>
This commit is contained in:
parent
e3b1d44c35
commit
95a8ff8356
@ -106,8 +106,8 @@ static int __devinit create_lt3593_led(const struct gpio_led *template,
|
|||||||
if (!template->retain_state_suspended)
|
if (!template->retain_state_suspended)
|
||||||
led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
|
led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
|
||||||
|
|
||||||
ret = gpio_request_one(template->gpio, GPIOF_DIR_OUT | state,
|
ret = devm_gpio_request_one(parent, template->gpio,
|
||||||
template->name);
|
GPIOF_DIR_OUT | state, template->name);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
@ -115,16 +115,12 @@ static int __devinit create_lt3593_led(const struct gpio_led *template,
|
|||||||
|
|
||||||
ret = led_classdev_register(parent, &led_dat->cdev);
|
ret = led_classdev_register(parent, &led_dat->cdev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto err;
|
return ret;
|
||||||
|
|
||||||
printk(KERN_INFO "%s: registered LT3593 LED '%s' at GPIO %d\n",
|
printk(KERN_INFO "%s: registered LT3593 LED '%s' at GPIO %d\n",
|
||||||
KBUILD_MODNAME, template->name, template->gpio);
|
KBUILD_MODNAME, template->name, template->gpio);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err:
|
|
||||||
gpio_free(led_dat->gpio);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void delete_lt3593_led(struct lt3593_led_data *led)
|
static void delete_lt3593_led(struct lt3593_led_data *led)
|
||||||
@ -134,7 +130,6 @@ static void delete_lt3593_led(struct lt3593_led_data *led)
|
|||||||
|
|
||||||
led_classdev_unregister(&led->cdev);
|
led_classdev_unregister(&led->cdev);
|
||||||
cancel_work_sync(&led->work);
|
cancel_work_sync(&led->work);
|
||||||
gpio_free(led->gpio);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devinit lt3593_led_probe(struct platform_device *pdev)
|
static int __devinit lt3593_led_probe(struct platform_device *pdev)
|
||||||
|
Loading…
Reference in New Issue
Block a user