Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1269698

[PATCH 1/2] leds-bcm6328: Reuse bcm6328_led_set() instead of copying its functionality

From Simon Arlott <simon@fire.lp0.eu>
Newsgroups linux.kernel
Subject [PATCH 1/2] leds-bcm6328: Reuse bcm6328_led_set() instead of copying its functionality
Date 2015-11-15 14:40 +0100
Message-ID <qv5Hc-20o-15@gated-at.bofh.it> (permalink)
References (3 earlier) <qowCu-1y1-19@gated-at.bofh.it> <qp1mW-4sA-1@gated-at.bofh.it> <qr8tX-2jQ-7@gated-at.bofh.it> <qr8tX-2jQ-5@gated-at.bofh.it> <qrqhb-5qX-9@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

When ensuring a consistent initial LED state in bcm6328_led (as they may
be blinking instead of on/off), the LED register is set using an inverted
copy of bcm6328_led_set(). To avoid further errors relating to active low
handling, call this function directly instead.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
---
I've decided not to move the locking as it should really cover the
setting of led->cdev.brightness too (not that it matters as the device
is not yet registered).

 drivers/leds/leds-bcm6328.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/leds/leds-bcm6328.c b/drivers/leds/leds-bcm6328.c
index c7ea5c6..95d0cf9 100644
--- a/drivers/leds/leds-bcm6328.c
+++ b/drivers/leds/leds-bcm6328.c
@@ -314,14 +314,10 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
 	} else {
 		led->cdev.brightness = LED_OFF;
 	}
-
-	if ((led->active_low && led->cdev.brightness == LED_FULL) ||
-	    (!led->active_low && led->cdev.brightness == LED_OFF))
-		bcm6328_led_mode(led, BCM6328_LED_MODE_ON);
-	else
-		bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
 	spin_unlock_irqrestore(lock, flags);
 
+	bcm6328_led_set(&led->cdev, led->cdev.brightness);
+
 	led->cdev.brightness_set = bcm6328_led_set;
 	led->cdev.blink_set = bcm6328_blink_set;
 
-- 
2.1.4

-- 
Simon Arlott
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: [PATCH] leds-bcm6328: Reuse bcm6328_led_set() instead of copying  its functionality Álvaro Fernández Rojas <noltari@gmail.com> - 2015-11-04 16:50 +0100
  Re: [PATCH] leds-bcm6328: Reuse bcm6328_led_set() instead of copying  its functionality Jacek Anaszewski <j.anaszewski@samsung.com> - 2015-11-05 11:50 +0100
    [PATCH 2/2] leds-bcm6328: Swap LED ON and OFF definitions Simon Arlott <simon@fire.lp0.eu> - 2015-11-15 14:40 +0100
      Re: [PATCH 2/2] leds-bcm6328: Swap LED ON and OFF definitions Jacek Anaszewski <j.anaszewski@samsung.com> - 2015-11-23 11:30 +0100
    [PATCH 1/2] leds-bcm6328: Reuse bcm6328_led_set() instead of copying  its functionality Simon Arlott <simon@fire.lp0.eu> - 2015-11-15 14:40 +0100
      Re: [PATCH 1/2] leds-bcm6328: Reuse bcm6328_led_set() instead of  copying its functionality Jacek Anaszewski <j.anaszewski@samsung.com> - 2015-11-16 15:40 +0100
        [PATCH 1/2 (v2)] leds-bcm6328: Reuse bcm6328_led_set() instead of  copying its functionality Simon Arlott <simon@fire.lp0.eu> - 2015-11-16 21:30 +0100
          Re: [PATCH 1/2 (v2)] leds-bcm6328: Reuse bcm6328_led_set() instead of  copying its functionality Álvaro Fernández Rojas <noltari@gmail.com> - 2015-11-16 22:40 +0100
            Re: [PATCH 1/2 (v2)] leds-bcm6328: Reuse bcm6328_led_set() instead of  copying its functionality Simon Arlott <simon@fire.lp0.eu> - 2015-11-17 08:50 +0100
              Re: [PATCH 1/2 (v2)] leds-bcm6328: Reuse bcm6328_led_set() instead of  copying its functionality Jacek Anaszewski <j.anaszewski@samsung.com> - 2015-11-17 09:10 +0100
                Re: [PATCH 1/2 (v2)] leds-bcm6328: Reuse bcm6328_led_set() instead of  copying its functionality Jacek Anaszewski <j.anaszewski@samsung.com> - 2015-11-17 09:20 +0100
                [PATCH 1/2 (v3)] leds-bcm6328: Reuse bcm6328_led_set() instead of  copying its functionality Simon Arlott <simon@fire.lp0.eu> - 2015-11-22 21:50 +0100
                Re: [PATCH 1/2 (v3)] leds-bcm6328: Reuse bcm6328_led_set() instead of  copying its functionality Jacek Anaszewski <j.anaszewski@samsung.com> - 2015-11-23 11:30 +0100
          Re: [PATCH 1/2 (v2)] leds-bcm6328: Reuse bcm6328_led_set() instead of  copying its functionality Jacek Anaszewski <j.anaszewski@samsung.com> - 2015-11-23 11:30 +0100

csiph-web