提交 8d613954 编写于 作者: T Tomas Winkler 提交者: Greg Kroah-Hartman

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: NTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 aff512c8
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define PATIENCE 500 #define PATIENCE 500
#undef PREFER_NTSC
#define PERSEVERE #define PERSEVERE
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*
......
...@@ -51,6 +51,10 @@ static int easycap_gain = 16; ...@@ -51,6 +51,10 @@ static int easycap_gain = 16;
module_param_named(gain, easycap_gain, int, S_IRUGO | S_IWUSR); module_param_named(gain, easycap_gain, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(gain, "Audio gain: 0,...,16(default),...31"); 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]; struct easycap_dongle easycapdc60_dongle[DONGLE_MANY];
...@@ -4102,13 +4106,9 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, ...@@ -4102,13 +4106,9 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface,
* BEWARE. * BEWARE.
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#ifdef PREFER_NTSC peasycap->ntsc = easycap_ntsc;
peasycap->ntsc = true; JOM(8, "defaulting initially to %s\n",
JOM(8, "defaulting initially to NTSC\n"); easycap_ntsc ? "NTSC" : "PAL");
#else
peasycap->ntsc = false;
JOM(8, "defaulting initially to PAL\n");
#endif /*PREFER_NTSC*/
rc = reset(peasycap); rc = reset(peasycap);
if (rc) { if (rc) {
SAM("ERROR: reset() returned %i\n", rc); SAM("ERROR: reset() returned %i\n", rc);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册