Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (452 commits)
  V4L/DVB (7731): tuner-xc2028: fix signal strength calculus
  V4L/DVB (7730): tuner-xc2028: Fix SCODE load for MTS firmwares
  V4L/DVB (7729): Fix VIDIOCGAP corruption in ivtv
  V4L/DVB (7728): tea5761: bugzilla #10462: tea5761 autodetection code were broken
  V4L/DVB (7726): cx23885: Enable cx23417 support on the HVR1800
  V4L/DVB (7725): cx23885: Add generic cx23417 hardware encoder support
  V4L/DVB (7723): pvrusb2: Clean up input selection list generation in V4L interface
  V4L/DVB (7722): pvrusb2: Implement FM radio support for Gotview USB2.0 DVD 2
  V4L/DVB (7721): pvrusb2: Restructure cx23416 firmware loading to have a common exit point
  V4L/DVB (7720): pvrusb2: Fix bad error code on cx23416 firmware load failure
  V4L/DVB (7719): pvrusb2: Implement input selection enforcement
  V4L/DVB (7718): pvrusb2-dvb: update Kbuild selections
  V4L/DVB (7717): pvrusb2-dvb: add DVB-T support for Hauppauge pvrusb2 model 73xxx
  V4L/DVB (7716): pvrusb2: clean up global functions
  V4L/DVB (7715): pvrusb2: Clean out all use of __FUNCTION__
  V4L/DVB (7714): pvrusb2: Fix hang on module removal
  V4L/DVB (7713): pvrusb2: Implement cleaner DVB kernel thread shutdown
  V4L/DVB (7712): pvrusb2: Close connect/disconnect race
  V4L/DVB (7711): pvrusb2: Fix race on module unload
  V4L/DVB (7710): pvrusb2: Implement critical digital streaming quirk for onair devices
  ...

1 files changed, 15 insertions, 15 deletions

diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 76e5c78d8ae4..3a1977f41e27 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -53,15 +53,15 @@
 
 #include "cx88.h"
 
-static unsigned int audio_debug = 0;
+static unsigned int audio_debug;
 module_param(audio_debug, int, 0644);
 MODULE_PARM_DESC(audio_debug, "enable debug messages [audio]");
 
-static unsigned int always_analog = 0;
+static unsigned int always_analog;
 module_param(always_analog,int,0644);
 MODULE_PARM_DESC(always_analog,"force analog audio out");
 
-static unsigned int radio_deemphasis = 0;
+static unsigned int radio_deemphasis;
 module_param(radio_deemphasis,int,0644);
 MODULE_PARM_DESC(radio_deemphasis, "Radio deemphasis time constant, "
                  "0=None, 1=50us (elsewhere), 2=75us (USA)");
@@ -265,12 +265,12 @@ static void set_audio_standard_BTSC(struct cx88_core *core, unsigned int sap,
         mode |= EN_FMRADIO_EN_RDS;
 
         if (sap) {
-                dprintk("%s SAP (status: unknown)\n", __FUNCTION__);
+                dprintk("%s SAP (status: unknown)\n", __func__);
                 set_audio_start(core, SEL_SAP);
                 set_audio_registers(core, btsc_sap);
                 set_audio_finish(core, mode);
         } else {
-                dprintk("%s (status: known-good)\n", __FUNCTION__);
+                dprintk("%s (status: known-good)\n", __func__);
                 set_audio_start(core, SEL_BTSC);
                 set_audio_registers(core, btsc);
                 set_audio_finish(core, mode);
@@ -351,16 +351,16 @@ static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode)
         set_audio_start(core,SEL_NICAM);
         switch (core->tvaudio) {
         case WW_L:
-                dprintk("%s SECAM-L NICAM (status: devel)\n", __FUNCTION__);
+                dprintk("%s SECAM-L NICAM (status: devel)\n", __func__);
                 set_audio_registers(core, nicam_l);
                 break;
         case WW_I:
-                dprintk("%s PAL-I NICAM (status: known-good)\n", __FUNCTION__);
+                dprintk("%s PAL-I NICAM (status: known-good)\n", __func__);
                 set_audio_registers(core, nicam_bgdki_common);
                 set_audio_registers(core, nicam_i);
                 break;
         default:
-                dprintk("%s PAL-BGDK NICAM (status: known-good)\n", __FUNCTION__);
+                dprintk("%s PAL-BGDK NICAM (status: known-good)\n", __func__);
                 set_audio_registers(core, nicam_bgdki_common);
                 set_audio_registers(core, nicam_default);
                 break;
@@ -600,28 +600,28 @@ static void set_audio_standard_A2(struct cx88_core *core, u32 mode)
         set_audio_start(core, SEL_A2);
         switch (core->tvaudio) {
         case WW_BG:
-                dprintk("%s PAL-BG A1/2 (status: known-good)\n", __FUNCTION__);
+                dprintk("%s PAL-BG A1/2 (status: known-good)\n", __func__);
                 set_audio_registers(core, a2_bgdk_common);
                 set_audio_registers(core, a2_bg);
                 set_audio_registers(core, a2_deemph50);
                 break;
         case WW_DK:
-                dprintk("%s PAL-DK A1/2 (status: known-good)\n", __FUNCTION__);
+                dprintk("%s PAL-DK A1/2 (status: known-good)\n", __func__);
                 set_audio_registers(core, a2_bgdk_common);
                 set_audio_registers(core, a2_dk);
                 set_audio_registers(core, a2_deemph50);
                 break;
         case WW_I:
-                dprintk("%s PAL-I A1 (status: known-good)\n", __FUNCTION__);
+                dprintk("%s PAL-I A1 (status: known-good)\n", __func__);
                 set_audio_registers(core, a1_i);
                 set_audio_registers(core, a2_deemph50);
                 break;
         case WW_L:
-                dprintk("%s AM-L (status: devel)\n", __FUNCTION__);
+                dprintk("%s AM-L (status: devel)\n", __func__);
                 set_audio_registers(core, am_l);
                 break;
         default:
-                dprintk("%s Warning: wrong value\n", __FUNCTION__);
+                dprintk("%s Warning: wrong value\n", __func__);
                 return;
                 break;
         };
@@ -637,7 +637,7 @@ static void set_audio_standard_EIAJ(struct cx88_core *core)
 
                 { /* end of list */ },
         };
-        dprintk("%s (status: unknown)\n", __FUNCTION__);
+        dprintk("%s (status: unknown)\n", __func__);
 
         set_audio_start(core, SEL_EIAJ);
         set_audio_registers(core, eiaj);
@@ -691,7 +691,7 @@ static void set_audio_standard_FM(struct cx88_core *core,
                 { /* end of list */ },
         };
 
-        dprintk("%s (status: unknown)\n", __FUNCTION__);
+        dprintk("%s (status: unknown)\n", __func__);
         set_audio_start(core, SEL_FMRADIO);
 
         switch (deemph) {