redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] em28xx: improve extension information messages 

Add a message with consistent prints before and after each
extension initialization, and provide a better text for module
load.

While here, add a missing sanity check for extension finish
code at em28xx-v4l extension.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
hifive-unleashed-5.1
Mauro Carvalho Chehab 2013-12-26 12:41:03 -03:00
parent 01c2819330
commit 9634614f35
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/usb/em28xx/em28xx-audio.c
View File

@ -649,7 +649,8 @@ static int em28xx_audio_init(struct em28xx *dev)
return 0; return 0;
} }
printk(KERN_INFO "em28xx-audio.c: probing for em28xx Audio Vendor Class\n"); em28xx_info("Binding audio extension\n");
printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus " printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus "
"Rechberger\n"); "Rechberger\n");
printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2007-2011 Mauro Carvalho Chehab\n"); printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2007-2011 Mauro Carvalho Chehab\n");
@ -702,6 +703,7 @@ static int em28xx_audio_init(struct em28xx *dev)
adev->sndcard = card; adev->sndcard = card;
adev->udev = dev->udev; adev->udev = dev->udev;
em28xx_info("Audio extension successfully initialized\n");
return 0; return 0;
} }

2
drivers/media/usb/em28xx/em28xx-core.c
View File

@ -1069,7 +1069,7 @@ int em28xx_register_extension(struct em28xx_ops *ops)
ops->init(dev); ops->init(dev);
} }
mutex_unlock(&em28xx_devlist_mutex); mutex_unlock(&em28xx_devlist_mutex);
printk(KERN_INFO "Em28xx: Initialized (%s) extension\n", ops->name); printk(KERN_INFO "em28xx: Registered (%s) extension\n", ops->name);
return 0; return 0;
} }
EXPORT_SYMBOL(em28xx_register_extension); EXPORT_SYMBOL(em28xx_register_extension);

7
drivers/media/usb/em28xx/em28xx-dvb.c
View File

@ -274,7 +274,7 @@ static int em28xx_stop_feed(struct dvb_demux_feed *feed)
static int em28xx_dvb_bus_ctrl(struct dvb_frontend *fe, int acquire) static int em28xx_dvb_bus_ctrl(struct dvb_frontend *fe, int acquire)
{ {
struct em28xx_i2c_bus *i2c_bus = fe->dvb->priv; struct em28xx_i2c_bus *i2c_bus = fe->dvb->priv;
struct em28xx *dev = i2c_bus->dev; struct em28xx *dev = i2c_bus->dev;
if (acquire) if (acquire)
return em28xx_set_mode(dev, EM28XX_DIGITAL_MODE); return em28xx_set_mode(dev, EM28XX_DIGITAL_MODE);
@ -992,10 +992,11 @@ static int em28xx_dvb_init(struct em28xx *dev)
if (!dev->board.has_dvb) { if (!dev->board.has_dvb) {
/* This device does not support the extension */ /* This device does not support the extension */
printk(KERN_INFO "em28xx_dvb: This device does not support the extension\n");
return 0; return 0;
} }
em28xx_info("Binding DVB extension\n");
dvb = kzalloc(sizeof(struct em28xx_dvb), GFP_KERNEL); dvb = kzalloc(sizeof(struct em28xx_dvb), GFP_KERNEL);
if (dvb == NULL) { if (dvb == NULL) {
@ -1407,7 +1408,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
/* MFE lock */ /* MFE lock */
dvb->adapter.mfe_shared = mfe_shared; dvb->adapter.mfe_shared = mfe_shared;
em28xx_info("Successfully loaded em28xx-dvb\n"); em28xx_info("DVB extension successfully initialized\n");
ret: ret:
em28xx_set_mode(dev, EM28XX_SUSPEND); em28xx_set_mode(dev, EM28XX_SUSPEND);
mutex_unlock(&dev->lock); mutex_unlock(&dev->lock);

4
drivers/media/usb/em28xx/em28xx-input.c
View File

@ -692,6 +692,8 @@ static int em28xx_ir_init(struct em28xx *dev)
return 0; return 0;
} }
em28xx_info("Registering input extension\n");
ir = kzalloc(sizeof(*ir), GFP_KERNEL); ir = kzalloc(sizeof(*ir), GFP_KERNEL);
rc = rc_allocate_device(); rc = rc_allocate_device();
if (!ir || !rc) if (!ir || !rc)
@ -785,6 +787,8 @@ static int em28xx_ir_init(struct em28xx *dev)
if (err) if (err)
goto error; goto error;
em28xx_info("Input extension successfully initalized\n");
return 0; return 0;
error: error:

5
drivers/media/usb/em28xx/em28xx-video.c
View File

@ -2216,8 +2216,7 @@ static int em28xx_v4l2_init(struct em28xx *dev)
return 0; return 0;
} }
printk(KERN_INFO "%s: v4l2 driver version %s\n", em28xx_info("Registering V4L2 extension\n");
dev->name, EM28XX_VERSION);
mutex_lock(&dev->lock); mutex_lock(&dev->lock);
@ -2499,6 +2498,8 @@ static int em28xx_v4l2_init(struct em28xx *dev)
/* initialize videobuf2 stuff */ /* initialize videobuf2 stuff */
em28xx_vb2_setup(dev); em28xx_vb2_setup(dev);
em28xx_info("V4L2 extension successfully initialized\n");
mutex_unlock(&dev->lock); mutex_unlock(&dev->lock);
return 0; return 0;