aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/waveartist.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-12-06 03:25:16 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-13 04:12:07 -0500
commit70d13e083c8589dd3edc2313777655da39cb3568 (patch)
tree41478a4699b3cbc8c5598ccc1863ea058948741e /sound/oss/waveartist.c
parent7ec80ddf0455ff3854a5ca524952d91b5eb676b2 (diff)
[ARM] netwinder: clean up GPIO naming
Netwinder was using gpio_xxx names which could clash with the GPIO layer. Add a 'nw_' prefix to ensure that these remain separate. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'sound/oss/waveartist.c')
-rw-r--r--sound/oss/waveartist.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index c47842fad657..2c63bb9da74a 100644
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -1483,16 +1483,14 @@ static void __exit unload_waveartist(struct address_info *hw)
1483#define VNC_HANDSET_DETECT 0x40 1483#define VNC_HANDSET_DETECT 0x40
1484#define VNC_DISABLE_AUTOSWITCH 0x80 1484#define VNC_DISABLE_AUTOSWITCH 0x80
1485 1485
1486extern spinlock_t gpio_lock;
1487
1488static inline void 1486static inline void
1489vnc_mute_spkr(wavnc_info *devc) 1487vnc_mute_spkr(wavnc_info *devc)
1490{ 1488{
1491 unsigned long flags; 1489 unsigned long flags;
1492 1490
1493 spin_lock_irqsave(&gpio_lock, flags); 1491 spin_lock_irqsave(&nw_gpio_lock, flags);
1494 cpld_modify(CPLD_UNMUTE, devc->spkr_mute_state ? 0 : CPLD_UNMUTE); 1492 nw_cpld_modify(CPLD_UNMUTE, devc->spkr_mute_state ? 0 : CPLD_UNMUTE);
1495 spin_unlock_irqrestore(&gpio_lock, flags); 1493 spin_unlock_irqrestore(&nw_gpio_lock, flags);
1496} 1494}
1497 1495
1498static void 1496static void