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

Commit 9634614f authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[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: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 01c28193

drivers/media/usb/em28xx/em28xx-audio.c

+3 −1
Original line number Diff line number Diff line
@@ -649,7 +649,8 @@ static int em28xx_audio_init(struct em28xx *dev) 
		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 "

			 "Rechberger\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->udev = dev->udev;



	em28xx_info("Audio extension successfully initialized\n");

	return 0;

}

drivers/media/usb/em28xx/em28xx-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1069,7 +1069,7 @@ int em28xx_register_extension(struct em28xx_ops *ops) 
		ops->init(dev);

	}

	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;

}

EXPORT_SYMBOL(em28xx_register_extension);

drivers/media/usb/em28xx/em28xx-dvb.c

+4 −3
Original line number Diff line number Diff line
@@ -992,10 +992,11 @@ static int em28xx_dvb_init(struct em28xx *dev) 


	if (!dev->board.has_dvb) {

		/* This device does not support the extension */

		printk(KERN_INFO "em28xx_dvb: This device does not support the extension\n");

		return 0;

	}



	em28xx_info("Binding DVB extension\n");



	dvb = kzalloc(sizeof(struct em28xx_dvb), GFP_KERNEL);



	if (dvb == NULL) {
@@ -1407,7 +1408,7 @@ static int em28xx_dvb_init(struct em28xx *dev) 
	/* MFE lock */

	dvb->adapter.mfe_shared = mfe_shared;



	em28xx_info("Successfully loaded em28xx-dvb\n");

	em28xx_info("DVB extension successfully initialized\n");

ret:

	em28xx_set_mode(dev, EM28XX_SUSPEND);

	mutex_unlock(&dev->lock);

drivers/media/usb/em28xx/em28xx-input.c

+4 −0
Original line number Diff line number Diff line
@@ -692,6 +692,8 @@ static int em28xx_ir_init(struct em28xx *dev) 
		return 0;

	}



	em28xx_info("Registering input extension\n");



	ir = kzalloc(sizeof(*ir), GFP_KERNEL);

	rc = rc_allocate_device();

	if (!ir || !rc)
@@ -785,6 +787,8 @@ static int em28xx_ir_init(struct em28xx *dev) 
	if (err)

		goto error;



	em28xx_info("Input extension successfully initalized\n");



	return 0;



error:

drivers/media/usb/em28xx/em28xx-video.c

+3 −2
Original line number Diff line number Diff line
@@ -2216,8 +2216,7 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
		return 0;

	}



	printk(KERN_INFO "%s: v4l2 driver version %s\n",

		dev->name, EM28XX_VERSION);

	em28xx_info("Registering V4L2 extension\n");



	mutex_lock(&dev->lock);
@@ -2499,6 +2498,8 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
	/* initialize videobuf2 stuff */

	em28xx_vb2_setup(dev);



	em28xx_info("V4L2 extension successfully initialized\n");



	mutex_unlock(&dev->lock);

	return 0;