From: Álvaro Fernández Rojas Date: Tue, 15 Dec 2015 20:03:51 +0000 (+0100) Subject: leds: bcm6328: simplify duplicated unlock in bcm6328_blink_set X-Git-Tag: v4.5-rc1~150^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=143b77ce03b44779987109486212838df2f03cae;p=thirdparty%2Fkernel%2Flinux.git leds: bcm6328: simplify duplicated unlock in bcm6328_blink_set 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 Signed-off-by: Jacek Anaszewski --- diff --git a/drivers/leds/leds-bcm6328.c b/drivers/leds/leds-bcm6328.c index e13daa2f31fb7..47f7c9f310bea 100644 --- a/drivers/leds/leds-bcm6328.c +++ b/drivers/leds/leds-bcm6328.c @@ -146,6 +146,7 @@ static int bcm6328_blink_set(struct led_classdev *led_cdev, struct bcm6328_led *led = container_of(led_cdev, struct bcm6328_led, cdev); unsigned long delay, flags; + int rc; if (!*delay_on) *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_mode(led, BCM6328_LED_MODE_BLINK); - - spin_unlock_irqrestore(led->lock, flags); + rc = 0; } else { - spin_unlock_irqrestore(led->lock, flags); dev_dbg(led_cdev->dev, "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,