lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] 5267/1: [AT91] Name conflict in mach-at91/leds.c

Browse Source 
The name of the platform device 'at91_pwm_leds' conflicts with the
function at91_pwm_leds().
So rename the device 'at91_pwm_leds_device' to be more specific.
Similarly rename 'at91_gpio_leds_device' for consistency.

Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Andrew Victor
2008-09-24 22:03:52 +01:00
committed by Russell King
parent bf07e4404e
commit 791ccf2e4d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-at91/leds.c
View File

@@ -28,7 +28,7 @@
static struct gpio_led_platform_data led_data; static struct gpio_led_platform_data led_data;
static struct platform_device at91_leds = { static struct platform_device at91_gpio_leds_device = {
.name = "leds-gpio", .name = "leds-gpio",
.id = -1, .id = -1,
.dev.platform_data = &led_data, .dev.platform_data = &led_data,
@@ -46,7 +46,7 @@ void __init at91_gpio_leds(struct gpio_led *leds, int nr)
led_data.leds = leds; led_data.leds = leds;
led_data.num_leds = nr; led_data.num_leds = nr;
platform_device_register(&at91_leds); platform_device_register(&at91_gpio_leds_device);
} }
#else #else
@@ -64,7 +64,7 @@ void __init at91_gpio_leds(struct gpio_led *leds, int nr) {}
static struct gpio_led_platform_data pwm_led_data; static struct gpio_led_platform_data pwm_led_data;
static struct platform_device at91_pwm_leds = { static struct platform_device at91_pwm_leds_device = {
.name = "leds-atmel-pwm", .name = "leds-atmel-pwm",
.id = -1, .id = -1,
.dev.platform_data = &pwm_led_data, .dev.platform_data = &pwm_led_data,
@@ -85,7 +85,7 @@ void __init at91_pwm_leds(struct gpio_led *leds, int nr)
pwm_led_data.num_leds = nr; pwm_led_data.num_leds = nr;
at91_add_device_pwm(pwm_mask); at91_add_device_pwm(pwm_mask);
platform_device_register(&at91_pwm_leds); platform_device_register(&at91_pwm_leds_device);
} }
#else #else
void __init at91_pwm_leds(struct gpio_led *leds, int nr){} void __init at91_pwm_leds(struct gpio_led *leds, int nr){}