From d19f3dd5121927747d3f56a0939db9a17bf8fc6b Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 19 Mar 2012 15:57:03 +0000 Subject: [PATCH] ar71xx: make rb750_latch_change 'static void' SVN-Revision: 31024 --- .../ar71xx/files/arch/mips/ath79/mach-rb750.c | 16 +++------------- .../mips/include/asm/mach-ath79/mach-rb750.h | 2 -- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c index 4ef1b10d37..524b385f2d 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c @@ -64,7 +64,7 @@ static struct platform_device rb750_nand_device = { } }; -int rb750_latch_change(u32 mask_clr, u32 mask_set) +static void rb750_latch_change(u32 mask_clr, u32 mask_set) { static DEFINE_SPINLOCK(lock); static u32 latch_set = RB750_LED_BITS | RB750_LVC573_LE; @@ -72,7 +72,6 @@ int rb750_latch_change(u32 mask_clr, u32 mask_set) static u32 latch_clr; unsigned long flags; u32 t; - int ret = 0; spin_lock_irqsave(&lock, flags); @@ -105,13 +104,9 @@ int rb750_latch_change(u32 mask_clr, u32 mask_set) __raw_readl(base + AR71XX_GPIO_REG_CLEAR); } - ret = 1; - unlock: spin_unlock_irqrestore(&lock, flags); - return ret; } -EXPORT_SYMBOL_GPL(rb750_latch_change); static void rb750_nand_enable_pins(void) { @@ -127,11 +122,6 @@ static void rb750_nand_disable_pins(void) rb750_latch_change(0, RB750_LVC573_LE); } -static void rb750_nand_latch_change(u32 clear, u32 set) -{ - rb750_latch_change(clear, set); -} - static void __init rb750_setup(void) { ath79_gpio_function_disable(AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN | @@ -153,13 +143,13 @@ static void __init rb750_setup(void) rb750_leds_data.num_leds = ARRAY_SIZE(rb750_leds); rb750_leds_data.leds = rb750_leds; - rb750_leds_data.latch_change = rb750_nand_latch_change; + rb750_leds_data.latch_change = rb750_latch_change; platform_device_register(&rb750_leds_device); rb750_nand_data.nce_line = RB750_NAND_NCE; rb750_nand_data.enable_pins = rb750_nand_enable_pins; rb750_nand_data.disable_pins = rb750_nand_disable_pins; - rb750_nand_data.latch_change = rb750_nand_latch_change; + rb750_nand_data.latch_change = rb750_latch_change; platform_device_register(&rb750_nand_device); } diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/mach-rb750.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/mach-rb750.h index 19d7a12123..8d1d22eea7 100644 --- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/mach-rb750.h +++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/mach-rb750.h @@ -71,6 +71,4 @@ struct rb7xx_nand_platform_data { void (*latch_change)(u32, u32); }; -int rb750_latch_change(u32 mask_clr, u32 mask_set); - #endif /* _MACH_RB750_H */ \ No newline at end of file -- 2.30.2