lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "[media] siano: apply debug flag to module level"

Browse Source 
This reverts commit ea3709435c.

As reported by Stephen Rothwell:

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "sms_dbg" [drivers/media/dvb/siano/smsusb.ko] undefined!
ERROR: "sms_dbg" [drivers/media/dvb/siano/smsdvb.ko] undefined!

Caused by commit ea3709435c ("[media] siano: apply debug flag to module
level").

Relevant config:
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_USB_DRV=m
CONFIG_SMS_SDIO_DRV=m

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab
2011-09-26 16:49:01 -03:00
parent 0f910bf000
commit 9e83b3e434
5 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/dvb/siano/sms-cards.c
View File

@@ -20,6 +20,10 @@
#include "sms-cards.h" #include "sms-cards.h"
#include "smsir.h" #include "smsir.h"
static int sms_dbg;
module_param_named(cards_dbg, sms_dbg, int, 0644);
MODULE_PARM_DESC(cards_dbg, "set debug level (info=1, adv=2 (or-able))");
static struct sms_board sms_boards[] = { static struct sms_board sms_boards[] = {
[SMS_BOARD_UNKNOWN] = { [SMS_BOARD_UNKNOWN] = {
.name = "Unknown board", .name = "Unknown board",

2
drivers/media/dvb/siano/smscoreapi.c
View File

@@ -39,7 +39,7 @@
#include "smsir.h" #include "smsir.h"
#include "smsendian.h" #include "smsendian.h"
int sms_dbg; static int sms_dbg;
module_param_named(debug, sms_dbg, int, 0644); module_param_named(debug, sms_dbg, int, 0644);
MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))"); MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");

1
drivers/media/dvb/siano/smscoreapi.h
View File

@@ -751,7 +751,6 @@ int smscore_led_state(struct smscore_device_t *core, int led);
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
extern int sms_dbg;
#define DBG_INFO 1 #define DBG_INFO 1
#define DBG_ADV 2 #define DBG_ADV 2

4
drivers/media/dvb/siano/smsdvb.c
View File

@@ -60,6 +60,10 @@ struct smsdvb_client_t {
static struct list_head g_smsdvb_clients; static struct list_head g_smsdvb_clients;
static struct mutex g_smsdvb_clientslock; static struct mutex g_smsdvb_clientslock;
static int sms_dbg;
module_param_named(debug, sms_dbg, int, 0644);
MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");
/* Events that may come from DVB v3 adapter */ /* Events that may come from DVB v3 adapter */
static void sms_board_dvb3_event(struct smsdvb_client_t *client, static void sms_board_dvb3_event(struct smsdvb_client_t *client,
enum SMS_DVB3_EVENTS event) { enum SMS_DVB3_EVENTS event) {

4
drivers/media/dvb/siano/smsusb.c
View File

@@ -29,6 +29,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "sms-cards.h" #include "sms-cards.h"
#include "smsendian.h" #include "smsendian.h"
static int sms_dbg;
module_param_named(debug, sms_dbg, int, 0644);
MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");
#define USB1_BUFFER_SIZE 0x1000 #define USB1_BUFFER_SIZE 0x1000
#define USB2_BUFFER_SIZE 0x4000 #define USB2_BUFFER_SIZE 0x4000