android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

leds: bcm6328: simplify duplicated unlock in bcm6328_blink_set

Browse Source 
Instead of duplicating the unlock we can store the return value and use a
single unlock before returning that value, which simplifies the code.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
This commit is contained in:
Álvaro Fernández Rojas
2015-12-15 21:03:51 +01:00
committed by Jacek Anaszewski
parent 4ba113b6d4
commit 143b77ce03
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/leds/leds-bcm6328.c
View File

@ -146,6 +146,7 @@ static int bcm6328_blink_set(struct led_classdev *led_cdev,
struct bcm6328_led *led = struct bcm6328_led *led =
container_of(led_cdev, struct bcm6328_led, cdev); container_of(led_cdev, struct bcm6328_led, cdev);
unsigned long delay, flags; unsigned long delay, flags;
int rc;
if (!*delay_on) if (!*delay_on)
*delay_on = BCM6328_LED_DEF_DELAY; *delay_on = BCM6328_LED_DEF_DELAY;
@ -183,16 +184,15 @@ static int bcm6328_blink_set(struct led_classdev *led_cdev,
bcm6328_led_write(led->mem + BCM6328_REG_INIT, val); bcm6328_led_write(led->mem + BCM6328_REG_INIT, val);
bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK); bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK);
rc = 0;
spin_unlock_irqrestore(led->lock, flags);
} else { } else {
spin_unlock_irqrestore(led->lock, flags);
dev_dbg(led_cdev->dev, dev_dbg(led_cdev->dev,
"fallback to soft blinking (delay already set)\n"); "fallback to soft blinking (delay already set)\n");
return -EINVAL; rc = -EINVAL;
} }
spin_unlock_irqrestore(led->lock, flags);
return 0; return rc;
} }
static int bcm6328_hwled(struct device *dev, struct device_node *nc, u32 reg, static int bcm6328_hwled(struct device *dev, struct device_node *nc, u32 reg,