Skip to contentSkip to conversation

arm/plat-orion: make gpiochip label unique (fwd)

PATCH New Nicolas Pitre 2 participants 2 messages Dec 19, 2011 – Dec 20, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Marvell Dove/MV78xx0/Orion SoC support
lore
Share & tools
lore

Nicolas Pitre

author
#0 lore raw

PATCH 1/1 arm/plat-orion: make gpiochip label unique (fwd)

Hello Olof,

Could you please merge this patch into the arm_soc fix branch? Thanks.

---------- >8
Date: Mon, 19 Dec 2011 17:49:48 +0100
From: Holger Brunck <[email protected]>
Subject: [PATCH] ARM: plat-orion: make gpiochip label unique

The former implementation adds a fix gpiochip label string to the framework. This is confusing because orion_gpio_init is called more than once and this ends up in different gpiochips with the same label.

This patch adds the already present orion_gpio_chip_count to the label string to make it unique in the system.

Signed-off-by Holger Brunck <[email protected]>
Cc Lennert Buytenhek <[email protected]>
Acked-by Nicolas Pitre <[email protected]>
---
 arch/arm/plat-orion/gpio.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
arch/arm/plat-orion/gpio.c +5 -1
index 41ab97e..10d1608 100644
@@ -384,12 +384,16 @@ void __init orion_gpio_init(int gpio_base, int ngpio,
 	struct orion_gpio_chip *ochip;
 	struct irq_chip_generic *gc;
 	struct irq_chip_type *ct;
+	char gc_label[16];
 
 	if (orion_gpio_chip_count == ARRAY_SIZE(orion_gpio_chips))
 		return;
 
+	snprintf(gc_label, sizeof(gc_label), "orion_gpio%d",
+		orion_gpio_chip_count);
+
 	ochip = orion_gpio_chips + orion_gpio_chip_count;
-	ochip->chip.label = "orion_gpio";
+	ochip->chip.label = kstrdup(gc_label, GFP_KERNEL);
 	ochip->chip.request = orion_gpio_request;
 	ochip->chip.direction_input = orion_gpio_direction_input;
 	ochip->chip.get = orion_gpio_get;
Signature · 1 line
1.7.1
Applied
#1 lore raw

PATCH 1/1 arm/plat-orion: make gpiochip label unique (fwd)

Quoted 5 lines · Nicolas Pitre

Hello Olof,

Could you please merge this patch into the arm_soc fix branch? Thanks.

Applied, thanks.

-Olof