diff options
author | Jingoo Han <jg1.han@samsung.com> | 2012-10-23 08:17:11 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@gmail.com> | 2012-11-26 17:28:43 -0500 |
commit | a99d76f9eb5336291fa6af713844d1c779484e30 (patch) | |
tree | d48484ba53d7b3fb007d57f571f4e74976493ac3 /drivers/leds/leds-gpio.c | |
parent | 14ce82e536455ace3d6ca70f77bbc2c6b25b8268 (diff) |
leds: leds-gpio: use gpio_request_one
Using gpio_request_one can make the code simpler because it can
set the direction and initial value in one shot.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'drivers/leds/leds-gpio.c')
-rw-r--r-- | drivers/leds/leds-gpio.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index 087d1e66f4f7..0b4185315261 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c | |||
@@ -106,10 +106,6 @@ static int __devinit create_gpio_led(const struct gpio_led *template, | |||
106 | return 0; | 106 | return 0; |
107 | } | 107 | } |
108 | 108 | ||
109 | ret = gpio_request(template->gpio, template->name); | ||
110 | if (ret < 0) | ||
111 | return ret; | ||
112 | |||
113 | led_dat->cdev.name = template->name; | 109 | led_dat->cdev.name = template->name; |
114 | led_dat->cdev.default_trigger = template->default_trigger; | 110 | led_dat->cdev.default_trigger = template->default_trigger; |
115 | led_dat->gpio = template->gpio; | 111 | led_dat->gpio = template->gpio; |
@@ -129,10 +125,12 @@ static int __devinit create_gpio_led(const struct gpio_led *template, | |||
129 | if (!template->retain_state_suspended) | 125 | if (!template->retain_state_suspended) |
130 | led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME; | 126 | led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME; |
131 | 127 | ||
132 | ret = gpio_direction_output(led_dat->gpio, led_dat->active_low ^ state); | 128 | ret = gpio_request_one(template->gpio, |
129 | GPIOF_DIR_OUT | (led_dat->active_low ^ state), | ||
130 | template->name); | ||
133 | if (ret < 0) | 131 | if (ret < 0) |
134 | goto err; | 132 | return ret; |
135 | 133 | ||
136 | INIT_WORK(&led_dat->work, gpio_led_work); | 134 | INIT_WORK(&led_dat->work, gpio_led_work); |
137 | 135 | ||
138 | ret = led_classdev_register(parent, &led_dat->cdev); | 136 | ret = led_classdev_register(parent, &led_dat->cdev); |