Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d613954 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

stagine/easycap: use module paramter for default encoding instead of ifdef 



remove PREFER_NTSC ifdef as it cannot be possible put into Kconfig

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent aff512c8

drivers/staging/easycap/easycap.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
 */

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

#define  PATIENCE  500

#undef   PREFER_NTSC

#define  PERSEVERE

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

/*

drivers/staging/easycap/easycap_main.c

+7 −7
Original line number Diff line number Diff line
@@ -51,6 +51,10 @@ static int easycap_gain = 16; 
module_param_named(gain, easycap_gain, int, S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(gain, "Audio gain: 0,...,16(default),...31");



static bool easycap_ntsc;

module_param_named(ntsc, easycap_ntsc, bool, S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(ntsc, "NTCS default encoding (default PAL)");







struct easycap_dongle easycapdc60_dongle[DONGLE_MANY];
@@ -4102,13 +4106,9 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, 
 *  BEWARE.

*/

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

#ifdef PREFER_NTSC

		peasycap->ntsc = true;

		JOM(8, "defaulting initially to NTSC\n");

#else

		peasycap->ntsc = false;

		JOM(8, "defaulting initially to PAL\n");

#endif /*PREFER_NTSC*/

		peasycap->ntsc = easycap_ntsc;

		JOM(8, "defaulting initially to %s\n",

			easycap_ntsc ? "NTSC" : "PAL");

		rc = reset(peasycap);

		if (rc) {

			SAM("ERROR: reset() returned %i\n", rc);