Commit 6e636a0a authored by Álvaro Fernández Rojas's avatar Álvaro Fernández Rojas Committed by Jacek Anaszewski

leds: bcm6358: merge bcm6358_led_mode and bcm6358_led_set

bcm6358_led_mode is now only called by bcm6358_led_set, so merge both
in one single function.
Signed-off-by: default avatarÁlvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
parent 143b77ce
...@@ -76,12 +76,15 @@ static unsigned long bcm6358_led_busy(void __iomem *mem) ...@@ -76,12 +76,15 @@ static unsigned long bcm6358_led_busy(void __iomem *mem)
return val; return val;
} }
static void bcm6358_led_mode(struct bcm6358_led *led, unsigned long value) static void bcm6358_led_set(struct led_classdev *led_cdev,
enum led_brightness value)
{ {
unsigned long val; struct bcm6358_led *led =
container_of(led_cdev, struct bcm6358_led, cdev);
unsigned long flags, val;
spin_lock_irqsave(led->lock, flags);
bcm6358_led_busy(led->mem); bcm6358_led_busy(led->mem);
val = bcm6358_led_read(led->mem + BCM6358_REG_MODE); val = bcm6358_led_read(led->mem + BCM6358_REG_MODE);
if ((led->active_low && value == LED_OFF) || if ((led->active_low && value == LED_OFF) ||
(!led->active_low && value != LED_OFF)) (!led->active_low && value != LED_OFF))
...@@ -89,17 +92,6 @@ static void bcm6358_led_mode(struct bcm6358_led *led, unsigned long value) ...@@ -89,17 +92,6 @@ static void bcm6358_led_mode(struct bcm6358_led *led, unsigned long value)
else else
val &= ~(BIT(led->pin)); val &= ~(BIT(led->pin));
bcm6358_led_write(led->mem + BCM6358_REG_MODE, val); bcm6358_led_write(led->mem + BCM6358_REG_MODE, val);
}
static void bcm6358_led_set(struct led_classdev *led_cdev,
enum led_brightness value)
{
struct bcm6358_led *led =
container_of(led_cdev, struct bcm6358_led, cdev);
unsigned long flags;
spin_lock_irqsave(led->lock, flags);
bcm6358_led_mode(led, value);
spin_unlock_irqrestore(led->lock, flags); spin_unlock_irqrestore(led->lock, flags);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment