Various minor clean-ups for Zen Vision

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27636 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 9 insertions, 5 deletions

diff --git a/firmware/drivers/audio/tlv320.c b/firmware/drivers/audio/tlv320.c
index b537fd5773..dc19023521 100644
--- a/firmware/drivers/audio/tlv320.c
+++ b/firmware/drivers/audio/tlv320.c
@@ -69,14 +69,14 @@ int tenthdb2master(int db)
 #define TLV320_ADDR 0x1A
 #endif
 
-struct tlv320_info
+static struct tlv320_info
 {
     int vol_l;
     int vol_r;
 } tlv320;
 
 /* Shadow registers */
-unsigned tlv320_regs[0xf];
+static unsigned tlv320_regs[0xf];
 
 static void tlv320_write_reg(unsigned reg, unsigned value)
 {
@@ -304,8 +304,8 @@ void audiohw_disable_recording(void)
     value_pc |= PC_ADC | PC_MIC | PC_LINE; /* ADC, MIC and LINE off */
     tlv320_write_reg(REG_PC, value_pc);
 }
-#endif
 
+#ifdef HAVE_FMRADIO_IN
 void audiohw_set_monitor(bool enable)
 {
     unsigned value_aap, value_pc;
@@ -325,3 +325,6 @@ void audiohw_set_monitor(bool enable)
     tlv320_write_reg(REG_AAP, value_aap);
     tlv320_write_reg(REG_PC,  value_pc);
 }
+#endif /* HAVE_FMRADIO_IN */
+#endif /* HAVE_RECORDING */
+
diff --git a/firmware/drivers/isp1583.c b/firmware/drivers/isp1583.c
index 26d638171c..f45ff6eb5e 100644
--- a/firmware/drivers/isp1583.c
+++ b/firmware/drivers/isp1583.c
@@ -397,15 +397,16 @@ static void setup_endpoints(void)
     ZVM_SPECIFIC;
 }
 
-void usb_helper(void)
+#if 0 /* currently unused */
+static void usb_helper(void)
 {
     if(ISP1583_GEN_INT_READ & ISP1583_INIT_INTEN_READ)
     {
         logf("Helper detected interrupt... [%d]", (int)current_tick);
         usb_drv_int();
     }
-    return;
 }
+#endif
 
 void usb_drv_init(void)
 {