Commit 62af33ec authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman
Browse files

staging/easycap: make module params private/static, fix build 



The easycap driver has module parameters (bars, gain, & debug)
with global scope that intrude on the kernel namespace and cause
build problems.  Change the names of them to be driver-specific
and make 2 of them static.

drivers/built-in.o:(.bss+0x97c00): multiple definition of `debug'
ld: Warning: size of symbol `debug' changed from 58 in arch/x86/built-in.o to 4 in drivers/built-in.o

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a65e659d

drivers/staging/easycap/easycap.h

+2 −2
Original line number Diff line number Diff line
@@ -630,13 +630,13 @@ unsigned long long int remainder; 


#if defined(EASYCAP_DEBUG)

#define JOT(n, format, args...) do { \

	if (n <= debug) { \

	if (n <= easycap_debug) { \

		printk(KERN_DEBUG "easycap:: %s: " \

			format, __func__, ##args);\

	} \

} while (0)

#define JOM(n, format, args...) do { \

	if (n <= debug) { \

	if (n <= easycap_debug) { \

		printk(KERN_DEBUG "easycap::%i%s: " \

			format, peasycap->isdongle, __func__, ##args);\

	} \

drivers/staging/easycap/easycap_debug.h

+2 −2
Original line number Diff line number Diff line
@@ -24,6 +24,6 @@ 
 *

*/

/*****************************************************************************/

extern int debug;

extern int gain;

extern int easycap_debug;

extern int easycap_gain;

extern struct easycap_dongle easycap_dongle[];

drivers/staging/easycap/easycap_low.c

+5 −5
Original line number Diff line number Diff line
@@ -1082,11 +1082,11 @@ SAM("0x%04X:0x%04X is audio vendor id\n", id1, id2); 
 *  SELECT AUDIO SOURCE "LINE IN" AND SET THE AUDIO GAIN.

*/

/*---------------------------------------------------------------------------*/

if (31 < gain)

	gain = 31;

if (0 > gain)

	gain = 0;

if (0 != audio_gainset(pusb_device, (__s8)gain))

if (31 < easycap_gain)

	easycap_gain = 31;

if (0 > easycap_gain)

	easycap_gain = 0;

if (0 != audio_gainset(pusb_device, (__s8)easycap_gain))

	SAY("ERROR: audio_gainset() failed\n");

check_vt(pusb_device);

return 0;

drivers/staging/easycap/easycap_main.c

+9 −9
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ 
#include "easycap_standard.h"

#include "easycap_ioctl.h"



int debug;

int bars;

int gain = 16;

module_param(debug, int, S_IRUGO | S_IWUSR);

module_param(bars, int, S_IRUGO | S_IWUSR);

module_param(gain, int, S_IRUGO | S_IWUSR);

static int easycap_debug;

static int easycap_bars;

int easycap_gain = 16;

module_param_named(debug, easycap_debug, int, S_IRUGO | S_IWUSR);

module_param_named(bars, easycap_bars, int, S_IRUGO | S_IWUSR);

module_param_named(gain, easycap_gain, int, S_IRUGO | S_IWUSR);



/*---------------------------------------------------------------------------*/

/*
@@ -1464,7 +1464,7 @@ if (peasycap->field_read == peasycap->field_fill) { 
easycap_testcard(peasycap, peasycap->field_read);

#else

if (0 <= input && INPUT_MANY > input) {

	if (bars && VIDEO_LOST_TOLERATE <= peasycap->lost[input])

	if (easycap_bars && VIDEO_LOST_TOLERATE <= peasycap->lost[input])

		easycap_testcard(peasycap, peasycap->field_read);

}

#endif /*EASYCAP_TESTCARD*/
@@ -5008,8 +5008,8 @@ easycap_module_init(void) 
int result;



SAY("========easycap=======\n");

JOT(4, "begins.  %i=debug %i=bars %i=gain\n", debug, bars, \

						gain);

JOT(4, "begins.  %i=debug %i=bars %i=gain\n", easycap_debug, easycap_bars, \

						easycap_gain);

SAY("version: " EASYCAP_DRIVER_VERSION "\n");

/*---------------------------------------------------------------------------*/

/*