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

Commit e36bc31f authored by Jean Delvare's avatar Jean Delvare Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11992): Add missing __devexit_p() 



Add missing __devexit_p() to several drivers. Also add a few missing
__init, __devinit and __exit markers. These errors could result in
build failures depending on the kernel configuration.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 96ceea27

drivers/media/dvb/bt8xx/bt878.c

+1 −7
Original line number Diff line number Diff line
@@ -508,12 +508,6 @@ static int __devinit bt878_probe(struct pci_dev *dev, 
	pci_set_master(dev);

	pci_set_drvdata(dev, bt);



/*        if(init_bt878(btv) < 0) {

		bt878_remove(dev);

		return -EIO;

	}

*/



	if ((result = bt878_mem_alloc(bt))) {

		printk(KERN_ERR "bt878: failed to allocate memory!\n");

		goto fail2;
@@ -579,7 +573,7 @@ static struct pci_driver bt878_pci_driver = { 
      .name	= "bt878",

      .id_table = bt878_pci_tbl,

      .probe	= bt878_probe,

      .remove	= bt878_remove,

      .remove	= __devexit_p(bt878_remove),

};



static int bt878_pci_driver_registered;

drivers/media/video/cx88/cx88-alsa.c

+3 −4
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ static struct pci_driver cx88_audio_pci_driver = { 
	.name     = "cx88_audio",

	.id_table = cx88_audio_pci_tbl,

	.probe    = cx88_audio_initdev,

	.remove   = cx88_audio_finidev,

	.remove   = __devexit_p(cx88_audio_finidev),

};



/****************************************************************************
@@ -881,7 +881,7 @@ static struct pci_driver cx88_audio_pci_driver = { 
/*

 * module init

 */

static int cx88_audio_init(void)

static int __init cx88_audio_init(void)

{

	printk(KERN_INFO "cx2388x alsa driver version %d.%d.%d loaded\n",

	       (CX88_VERSION_CODE >> 16) & 0xff,
@@ -897,9 +897,8 @@ static int cx88_audio_init(void) 
/*

 * module remove

 */

static void cx88_audio_fini(void)

static void __exit cx88_audio_fini(void)

{



	pci_unregister_driver(&cx88_audio_pci_driver);

}

drivers/media/video/mx3_camera.c

+3 −3
Original line number Diff line number Diff line
@@ -1074,7 +1074,7 @@ static struct soc_camera_host_ops mx3_soc_camera_host_ops = { 
	.set_bus_param	= mx3_camera_set_bus_param,

};



static int mx3_camera_probe(struct platform_device *pdev)

static int __devinit mx3_camera_probe(struct platform_device *pdev)

{

	struct mx3_camera_dev *mx3_cam;

	struct resource *res;
@@ -1194,11 +1194,11 @@ static struct platform_driver mx3_camera_driver = { 
		.name	= MX3_CAM_DRV_NAME,

	},

	.probe		= mx3_camera_probe,

	.remove		= __exit_p(mx3_camera_remove),

	.remove		= __devexit_p(mx3_camera_remove),

};





static int __devinit mx3_camera_init(void)

static int __init mx3_camera_init(void)

{

	return platform_driver_register(&mx3_camera_driver);

}

drivers/media/video/pxa_camera.c

+3 −3
Original line number Diff line number Diff line
@@ -1551,7 +1551,7 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = { 
	.set_bus_param	= pxa_camera_set_bus_param,

};



static int pxa_camera_probe(struct platform_device *pdev)

static int __devinit pxa_camera_probe(struct platform_device *pdev)

{

	struct pxa_camera_dev *pcdev;

	struct resource *res;
@@ -1726,11 +1726,11 @@ static struct platform_driver pxa_camera_driver = { 
		.name	= PXA_CAM_DRV_NAME,

	},

	.probe		= pxa_camera_probe,

	.remove		= __exit_p(pxa_camera_remove),

	.remove		= __devexit_p(pxa_camera_remove),

};





static int __devinit pxa_camera_init(void)

static int __init pxa_camera_init(void)

{

	return platform_driver_register(&pxa_camera_driver);

}

drivers/media/video/soc_camera.c

+1 −1
Original line number Diff line number Diff line
@@ -1205,7 +1205,7 @@ static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev) 


static struct platform_driver __refdata soc_camera_pdrv = {

	.probe	= soc_camera_pdrv_probe,

	.remove	= __exit_p(soc_camera_pdrv_remove),

	.remove	= __devexit_p(soc_camera_pdrv_remove),

	.driver	= {

		.name = "soc-camera-pdrv",

		.owner = THIS_MODULE,