Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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
Loading
Loading
Loading
Loading
+6 −14
Original line number Diff line number Diff line
@@ -76,12 +76,15 @@ static unsigned long bcm6358_led_busy(void __iomem *mem)
	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);

	val = bcm6358_led_read(led->mem + BCM6358_REG_MODE);
	if ((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)
	else
		val &= ~(BIT(led->pin));
	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);
}