Skip to contentSkip to conversation

leds-bcm6328: code cleaning

PATCH Superseded Álvaro Fernández Rojas 4 participants 21 messages Nov 29, 2015 – Dec 16, 2015 LED

lore
Share & tools
lore
#0 lore raw

PATCH 1/7 leds-bcm6328: code cleaning

- Remove double whitespace
- Add missing brackets
- Add spinlock info

---
 drivers/leds/leds-bcm6328.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/leds/leds-bcm6328.c +4 -4
index 0329dee..1ef69c2 100644
@@ -42,7 +42,7 @@
 #define BCM6328_LED_SHIFT_TEST		BIT(30)
 #define BCM6328_LED_TEST		BIT(31)
 #define BCM6328_INIT_MASK		(BCM6328_SERIAL_LED_EN | \
-					 BCM6328_SERIAL_LED_MUX  | \
+					 BCM6328_SERIAL_LED_MUX | \
 					 BCM6328_SERIAL_LED_CLK_NPOL | \
 					 BCM6328_SERIAL_LED_DATA_PPOL | \
 					 BCM6328_SERIAL_LED_SHIFT_DIR)
@@ -151,9 +151,9 @@ static int bcm6328_blink_set(struct led_classdev *led_cdev,
 	}
 
 	delay = *delay_on / BCM6328_LED_INTERVAL_MS;
-	if (delay == 0)
+	if (delay == 0) {
 		delay = 1;
-	else if (delay > BCM6328_LED_INTV_MASK) {
+	} else if (delay > BCM6328_LED_INTV_MASK) {
 		dev_dbg(led_cdev->dev,
 			"fallback to soft blinking (delay > %ums)\n",
 			BCM6328_LED_INTV_MASK * BCM6328_LED_INTERVAL_MS);
@@ -337,7 +337,7 @@ static int bcm6328_leds_probe(struct platform_device *pdev)
 	struct device_node *child;
 	struct resource *mem_r;
 	void __iomem *mem;
-	spinlock_t *lock;
+	spinlock_t *lock; /* memory lock */
 	unsigned long val, *blink_leds, *blink_delay;
 
 	mem_r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Signature · 1 line
1.9.1
#1 lore raw

PATCH 2/7 leds-bcm6328: remove unneded lock when checking initial LED status

This lock isn't really needed, since we're only reading the register and changes made to other LEDs aren't relevant.

---
 drivers/leds/leds-bcm6328.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/leds/leds-bcm6328.c +0 -3
index 1ef69c2..cd54264 100644
@@ -264,7 +264,6 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
 		       unsigned long *blink_leds, unsigned long *blink_delay)
 {
 	struct bcm6328_led *led;
-	unsigned long flags;
 	const char *state;
 	int rc;
 
@@ -286,7 +285,6 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
 						    "linux,default-trigger",
 						    NULL);
 
-	spin_lock_irqsave(lock, flags);
 	if (!of_property_read_string(nc, "default-state", &state)) {
 		if (!strcmp(state, "on")) {
 			led->cdev.brightness = LED_FULL;
@@ -314,7 +312,6 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
 	} else {
 		led->cdev.brightness = LED_OFF;
 	}
-	spin_unlock_irqrestore(lock, flags);
 
 	bcm6328_led_set(&led->cdev, led->cdev.brightness);
 
Signature · 1 line
1.9.1
#2 lore raw

PATCH 3/7 leds-bcm6358: Use bcm6358_led_set() in order to get rid of the lock

In reply to Álvaro Fernández Rojas
---
 drivers/leds/leds-bcm6358.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/leds/leds-bcm6358.c +2 -1
index 82b4ee1..a98cc71 100644
@@ -141,9 +141,10 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
 	} else {
 		led->cdev.brightness = LED_OFF;
 	}
-	bcm6358_led_mode(led, led->cdev.brightness);
 	spin_unlock_irqrestore(lock, flags);
 
+	bcm6358_led_set(&led->cdev, led->cdev.brightness);
+
 	led->cdev.brightness_set = bcm6358_led_set;
 
 	rc = led_classdev_register(dev, &led->cdev);
Signature · 1 line
1.9.1
#3 lore raw

PATCH 4/7 leds-bcm6358: remove unneded lock when checking initial LED status

In reply to Álvaro Fernández Rojas

This lock isn't really needed, since we're only reading the register and changes made to other LEDs aren't relevant.

---
 drivers/leds/leds-bcm6358.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/leds/leds-bcm6358.c +0 -3
index a98cc71..ab09ea4 100644
@@ -99,7 +99,6 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
 		       void __iomem *mem, spinlock_t *lock)
 {
 	struct bcm6358_led *led;
-	unsigned long flags;
 	const char *state;
 	int rc;
 
@@ -119,7 +118,6 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
 						    "linux,default-trigger",
 						    NULL);
 
-	spin_lock_irqsave(lock, flags);
 	if (!of_property_read_string(nc, "default-state", &state)) {
 		if (!strcmp(state, "on")) {
 			led->cdev.brightness = LED_FULL;
@@ -141,7 +139,6 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
 	} else {
 		led->cdev.brightness = LED_OFF;
 	}
-	spin_unlock_irqrestore(lock, flags);
 
 	bcm6358_led_set(&led->cdev, led->cdev.brightness);
 
Signature · 1 line
1.9.1
#4 lore raw

PATCH 5/7 leds-bcm6328: switch to __raw_readl() and __raw_writel()

In reply to Álvaro Fernández Rojas
---
 drivers/leds/leds-bcm6328.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/leds/leds-bcm6328.c +2 -2
index cd54264..876f0ce 100644
@@ -76,12 +76,12 @@ struct bcm6328_led {
 
 static void bcm6328_led_write(void __iomem *reg, unsigned long data)
 {
-	iowrite32be(data, reg);
+	__raw_writel(data, reg);
 }
 
 static unsigned long bcm6328_led_read(void __iomem *reg)
 {
-	return ioread32be(reg);
+	return __raw_readl(reg);
 }
 
 /**
Signature · 1 line
1.9.1
#5 lore raw

Re: [PATCH 5/7] leds-bcm6328: switch to __raw_readl() and __raw_writel()

Quoted 15 lines · Álvaro Fernández Rojas
---
 drivers/leds/leds-bcm6328.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/leds/leds-bcm6328.c +0 -1
index cd54264..876f0ce 100644
@@ -76,12 +76,12 @@ struct bcm6328_led {
 
 static void bcm6328_led_write(void __iomem *reg, unsigned long data)
 {
-	iowrite32be(data, reg);

drivers/leds/leds-bcm6328.c struct bcm6328_led { · line 87

Quoted 10 lines
drivers/leds/leds-bcm6328.c +2 -1
+	__raw_writel(data, reg);
 }
 
 static unsigned long bcm6328_led_read(void __iomem *reg)
 {
-	return ioread32be(reg);
+	return __raw_readl(reg);
 }
 
 /**

If the wrapper functions don't add anything, would it not be better to just remove them completely?

Signature · 1 line
Simon Arlott
#6 lore raw

Re: [PATCH 5/7] leds-bcm6328: switch to __raw_readl() and __raw_writel()

In reply to Álvaro Fernández Rojas
Quoted 1 line · Álvaro Fernández Rojas

This driver has a slight chance of running on a BCM63138 SoC which is ARM-based and little endian, so I would keep the wrapper around here just so it is easy for somebody to add support for a different platform later on.

Quoted 24 lines
---
 drivers/leds/leds-bcm6328.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/leds/leds-bcm6328.c +2 -2
index cd54264..876f0ce 100644
@@ -76,12 +76,12 @@ struct bcm6328_led {
 
 static void bcm6328_led_write(void __iomem *reg, unsigned long data)
 {
-	iowrite32be(data, reg);
+	__raw_writel(data, reg);
 }
 
 static unsigned long bcm6328_led_read(void __iomem *reg)
 {
-	return ioread32be(reg);
+	return __raw_readl(reg);
 }
 
 /**
#7 lore raw

Re: [PATCH 5/7] leds-bcm6328: switch to __raw_readl() and __raw_writel()

Hi Florian, Alvaro

Quoted 7 lines · Florian Fainelli
Quoted 1 line · Álvaro Fernández Rojas

This driver has a slight chance of running on a BCM63138 SoC which is ARM-based and little endian, so I would keep the wrapper around here just so it is easy for somebody to add support for a different platform later on.

Thanks for sharing this info.

Alvaro - is the performance gain resulting from this change specifically important for some of your use cases?

Quoted 26 lines
Quoted 24 lines
---
  drivers/leds/leds-bcm6328.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/leds/leds-bcm6328.c +2 -2
index cd54264..876f0ce 100644
@@ -76,12 +76,12 @@ struct bcm6328_led {
 
  static void bcm6328_led_write(void __iomem *reg, unsigned long data)
  {
-	iowrite32be(data, reg);
+	__raw_writel(data, reg);
  }
 
  static unsigned long bcm6328_led_read(void __iomem *reg)
  {
-	return ioread32be(reg);
+	return __raw_readl(reg);
  }
 
  /**
Signature · 2 lines
Best Regards,
Jacek Anaszewski
#8 lore raw

PATCH 6/7 leds-bcm6358: switch to __raw_readl() and __raw_writel()

In reply to Álvaro Fernández Rojas
---
 drivers/leds/leds-bcm6358.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/leds/leds-bcm6358.c +2 -2
index ab09ea4..ae32f94 100644
@@ -49,12 +49,12 @@ struct bcm6358_led {
 
 static void bcm6358_led_write(void __iomem *reg, unsigned long data)
 {
-	iowrite32be(data, reg);
+	__raw_writel(data, reg);
 }
 
 static unsigned long bcm6358_led_read(void __iomem *reg)
 {
-	return ioread32be(reg);
+	return __raw_readl(reg);
 }
 
 static unsigned long bcm6358_led_busy(void __iomem *mem)
Signature · 1 line
1.9.1
#9 lore raw

PATCH 7/7 leds-bcm6328: simplify duplicated unlock in bcm6328_blink_set

In reply to Álvaro Fernández Rojas
---
 drivers/leds/leds-bcm6328.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/leds/leds-bcm6328.c +5 -5
index 876f0ce..a361829 100644
@@ -138,6 +138,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;
@@ -175,16 +176,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,
Signature · 1 line
1.9.1
#10 lore raw
In reply to Álvaro Fernández Rojas

Hi Alvaro,

Thanks for the patches. Please use "leds: bcm6328"
(or leds: bcm6358) prefix in the commit title. Please also add commit description to the patches that are missing it.

Quoted 44 lines · Álvaro Fernández Rojas

- Remove double whitespace
- Add missing brackets
- Add spinlock info

---
  drivers/leds/leds-bcm6328.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
drivers/leds/leds-bcm6328.c +4 -4
index 0329dee..1ef69c2 100644
@@ -42,7 +42,7 @@
  #define BCM6328_LED_SHIFT_TEST		BIT(30)
  #define BCM6328_LED_TEST		BIT(31)
  #define BCM6328_INIT_MASK		(BCM6328_SERIAL_LED_EN | \
-					 BCM6328_SERIAL_LED_MUX  | \
+					 BCM6328_SERIAL_LED_MUX | \
  					 BCM6328_SERIAL_LED_CLK_NPOL | \
  					 BCM6328_SERIAL_LED_DATA_PPOL | \
  					 BCM6328_SERIAL_LED_SHIFT_DIR)
@@ -151,9 +151,9 @@ static int bcm6328_blink_set(struct led_classdev *led_cdev,
  	}
 
  	delay = *delay_on / BCM6328_LED_INTERVAL_MS;
-	if (delay == 0)
+	if (delay == 0) {
  		delay = 1;
-	else if (delay > BCM6328_LED_INTV_MASK) {
+	} else if (delay > BCM6328_LED_INTV_MASK) {
  		dev_dbg(led_cdev->dev,
  			"fallback to soft blinking (delay > %ums)\n",
  			BCM6328_LED_INTV_MASK * BCM6328_LED_INTERVAL_MS);
@@ -337,7 +337,7 @@ static int bcm6328_leds_probe(struct platform_device *pdev)
  	struct device_node *child;
  	struct resource *mem_r;
  	void __iomem *mem;
-	spinlock_t *lock;
+	spinlock_t *lock; /* memory lock */
  	unsigned long val, *blink_leds, *blink_delay;
 
  	mem_r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Signature · 2 lines
Best Regards,
Jacek Anaszewski
#11 lore raw

v2 cover leds: bcm6328/bcm6358: several fixes and improvements

In reply to Álvaro Fernández Rojas

These patches add several fixes and improvements for leds-bcm6328 and leds-bcm6358.

v2: introduce changes suggested by Jacek and Florian
- change "leds-bcm6328:" to "leds: bcm6328:"
- change "leds-bcm6358:" to "leds: bcm6358:"
- add little endian support
- bcm6358: Merge bcm6358_led_mode into bcm6358_led_set

Álvaro Fernández Rojas (8):
leds: bcm6328: code cleaning
leds: bcm6328: remove unneded lock when checking initial LED
leds: bcm6358: Use bcm6358_led_set() in order to get rid of the lock
leds: bcm6358: remove unneded lock when checking initial LED status
leds: bcm6328: add little endian support
leds: bcm6358: add little endian support
leds: bcm6328: simplify duplicated unlock in bcm6328_blink_set
leds: bcm6358: merge bcm6358_led_mode and bcm6358_led_set

 drivers/leds/leds-bcm6328.c | 29 +++++++++++++++++------------
 drivers/leds/leds-bcm6358.c | 34 ++++++++++++++++------------------
 2 files changed, 33 insertions(+), 30 deletions(-)
Signature · 1 line
1.9.1
#12 lore raw

PATCH v2 1/8 leds: bcm6328: code cleaning

- Remove double whitespace
- Add missing brackets
- Add spinlock info

---
v2: no changes

 drivers/leds/leds-bcm6328.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/leds/leds-bcm6328.c +4 -4
index 0329dee..1ef69c2 100644
@@ -42,7 +42,7 @@
 #define BCM6328_LED_SHIFT_TEST		BIT(30)
 #define BCM6328_LED_TEST		BIT(31)
 #define BCM6328_INIT_MASK		(BCM6328_SERIAL_LED_EN | \
-					 BCM6328_SERIAL_LED_MUX  | \
+					 BCM6328_SERIAL_LED_MUX | \
 					 BCM6328_SERIAL_LED_CLK_NPOL | \
 					 BCM6328_SERIAL_LED_DATA_PPOL | \
 					 BCM6328_SERIAL_LED_SHIFT_DIR)
@@ -151,9 +151,9 @@ static int bcm6328_blink_set(struct led_classdev *led_cdev,
 	}
 
 	delay = *delay_on / BCM6328_LED_INTERVAL_MS;
-	if (delay == 0)
+	if (delay == 0) {
 		delay = 1;
-	else if (delay > BCM6328_LED_INTV_MASK) {
+	} else if (delay > BCM6328_LED_INTV_MASK) {
 		dev_dbg(led_cdev->dev,
 			"fallback to soft blinking (delay > %ums)\n",
 			BCM6328_LED_INTV_MASK * BCM6328_LED_INTERVAL_MS);
@@ -337,7 +337,7 @@ static int bcm6328_leds_probe(struct platform_device *pdev)
 	struct device_node *child;
 	struct resource *mem_r;
 	void __iomem *mem;
-	spinlock_t *lock;
+	spinlock_t *lock; /* memory lock */
 	unsigned long val, *blink_leds, *blink_delay;
 
 	mem_r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Signature · 1 line
1.9.1
#13 lore raw

PATCH v2 2/8 leds: bcm6328: remove unneded lock when checking initial LED

In reply to Álvaro Fernández Rojas

This lock isn't really needed, since we're only reading the register and changes made to other LEDs aren't relevant.

---
v2: no changes

 drivers/leds/leds-bcm6328.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/leds/leds-bcm6328.c +0 -3
index 1ef69c2..cd54264 100644
@@ -264,7 +264,6 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
 		       unsigned long *blink_leds, unsigned long *blink_delay)
 {
 	struct bcm6328_led *led;
-	unsigned long flags;
 	const char *state;
 	int rc;
 
@@ -286,7 +285,6 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
 						    "linux,default-trigger",
 						    NULL);
 
-	spin_lock_irqsave(lock, flags);
 	if (!of_property_read_string(nc, "default-state", &state)) {
 		if (!strcmp(state, "on")) {
 			led->cdev.brightness = LED_FULL;
@@ -314,7 +312,6 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
 	} else {
 		led->cdev.brightness = LED_OFF;
 	}
-	spin_unlock_irqrestore(lock, flags);
 
 	bcm6328_led_set(&led->cdev, led->cdev.brightness);
 
Signature · 1 line
1.9.1
#14 lore raw

PATCH v2 3/8 leds: bcm6358: Use bcm6358_led_set() in order to get rid of the lock

In reply to Álvaro Fernández Rojas

Replaces bcm6358_led_mode with bcm6358_led_set so we don't need to handle the lock.

---
v2: no changes

 drivers/leds/leds-bcm6358.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/leds/leds-bcm6358.c +2 -1
index 82b4ee1..a98cc71 100644
@@ -141,9 +141,10 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
 	} else {
 		led->cdev.brightness = LED_OFF;
 	}
-	bcm6358_led_mode(led, led->cdev.brightness);
 	spin_unlock_irqrestore(lock, flags);
 
+	bcm6358_led_set(&led->cdev, led->cdev.brightness);
+
 	led->cdev.brightness_set = bcm6358_led_set;
 
 	rc = led_classdev_register(dev, &led->cdev);
Signature · 1 line
1.9.1
#15 lore raw

PATCH v2 4/8 leds: bcm6358: remove unneded lock when checking initial LED status

In reply to Álvaro Fernández Rojas

This lock isn't really needed, since we're only reading the register and changes made to other LEDs aren't relevant.

---
v2: no changes

 drivers/leds/leds-bcm6358.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/leds/leds-bcm6358.c +0 -3
index a98cc71..ab09ea4 100644
@@ -99,7 +99,6 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
 		       void __iomem *mem, spinlock_t *lock)
 {
 	struct bcm6358_led *led;
-	unsigned long flags;
 	const char *state;
 	int rc;
 
@@ -119,7 +118,6 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
 						    "linux,default-trigger",
 						    NULL);
 
-	spin_lock_irqsave(lock, flags);
 	if (!of_property_read_string(nc, "default-state", &state)) {
 		if (!strcmp(state, "on")) {
 			led->cdev.brightness = LED_FULL;
@@ -141,7 +139,6 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
 	} else {
 		led->cdev.brightness = LED_OFF;
 	}
-	spin_unlock_irqrestore(lock, flags);
 
 	bcm6358_led_set(&led->cdev, led->cdev.brightness);
 
Signature · 1 line
1.9.1
#16 lore raw

PATCH v2 5/8 leds: bcm6328: add little endian support

In reply to Álvaro Fernández Rojas

This adds little endian support while keeping big endian support.

---
v2: add little endian support instead of switch to __raw io

 drivers/leds/leds-bcm6328.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/leds/leds-bcm6328.c +8 -0
index cd54264..e13daa2 100644
@@ -76,12 +76,20 @@ struct bcm6328_led {
 
 static void bcm6328_led_write(void __iomem *reg, unsigned long data)
 {
+#ifdef CONFIG_CPU_BIG_ENDIAN
 	iowrite32be(data, reg);
+#else
+	writel(data, reg);
+#endif
 }
 
 static unsigned long bcm6328_led_read(void __iomem *reg)
 {
+#ifdef CONFIG_CPU_BIG_ENDIAN
 	return ioread32be(reg);
+#else
+	return readl(reg);
+#endif
 }
 
 /**
Signature · 1 line
1.9.1
#17 lore raw

PATCH v2 6/8 leds: bcm6358: add little endian support

In reply to Álvaro Fernández Rojas

This adds little endian support while keeping big endian support.

---
v2: add little endian support instead of switch to __raw io

 drivers/leds/leds-bcm6358.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/leds/leds-bcm6358.c +8 -0
index ab09ea4..ffc978d 100644
@@ -49,12 +49,20 @@ struct bcm6358_led {
 
 static void bcm6358_led_write(void __iomem *reg, unsigned long data)
 {
+#ifdef CONFIG_CPU_BIG_ENDIAN
 	iowrite32be(data, reg);
+#else
+	writel(data, reg);
+#endif
 }
 
 static unsigned long bcm6358_led_read(void __iomem *reg)
 {
+#ifdef CONFIG_CPU_BIG_ENDIAN
 	return ioread32be(reg);
+#else
+	return readl(reg);
+#endif
 }
 
 static unsigned long bcm6358_led_busy(void __iomem *mem)
Signature · 1 line
1.9.1
#18 lore raw

PATCH v2 7/8 leds: bcm6328: simplify duplicated unlock in bcm6328_blink_set

In reply to Álvaro Fernández Rojas

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

---
v2: no changes

 drivers/leds/leds-bcm6328.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/leds/leds-bcm6328.c +5 -5
index e13daa2..47f7c9f 100644
@@ -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,
Signature · 1 line
1.9.1
#19 lore raw

PATCH v2 8/8 leds: bcm6358: merge bcm6358_led_mode and bcm6358_led_set

In reply to Álvaro Fernández Rojas

bcm6358_led_mode is now only called by bcm6358_led_set, so merge both in one single function.

---
v2: introduce new patch to merge bcm6358_led_mode into bcm6358_led_set

 drivers/leds/leds-bcm6358.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)
drivers/leds/leds-bcm6358.c +6 -14
index ffc978d..7413e3e 100644
@@ -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);
 }
 
Signature · 1 line
1.9.1
#20 lore raw

Re: [PATCH v2 0/8] leds: bcm6328/bcm6358: several fixes and improvements

In reply to Álvaro Fernández Rojas

Hi Alvaro,

Thanks for the update, patch set applied.

Quoted 23 lines · Álvaro Fernández Rojas

These patches add several fixes and improvements for leds-bcm6328 and leds-bcm6358.

v2: introduce changes suggested by Jacek and Florian
- change "leds-bcm6328:" to "leds: bcm6328:"
- change "leds-bcm6358:" to "leds: bcm6358:"
- add little endian support
- bcm6358: Merge bcm6358_led_mode into bcm6358_led_set

Álvaro Fernández Rojas (8):
leds: bcm6328: code cleaning
leds: bcm6328: remove unneded lock when checking initial LED
leds: bcm6358: Use bcm6358_led_set() in order to get rid of the lock
leds: bcm6358: remove unneded lock when checking initial LED status
leds: bcm6328: add little endian support
leds: bcm6358: add little endian support
leds: bcm6328: simplify duplicated unlock in bcm6328_blink_set
leds: bcm6358: merge bcm6358_led_mode and bcm6358_led_set

  drivers/leds/leds-bcm6328.c | 29 +++++++++++++++++------------
  drivers/leds/leds-bcm6358.c | 34 ++++++++++++++++------------------
  2 files changed, 33 insertions(+), 30 deletions(-)
Signature · 2 lines
Best Regards,
Jacek Anaszewski