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

Commit 9710e7a7 authored by Peter Huewe's avatar Peter Huewe Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13288): adding __init/__exit macros to various drivers 



Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions of the following drivers in media video:
    drivers/media/video/ivtv/ivtv-driver.c
    drivers/media/video/cx18/cx18-driver.c
    drivers/media/video/davinci/dm355_ccdc.c
    drivers/media/video/davinci/dm644x_ccdc.c
    drivers/media/video/saa7164/saa7164-core.c
    drivers/media/video/saa7134/saa7134-core.c
    drivers/media/video/cx23885/cx23885-core.c

Cc: Hermann Pitton <hermann-pitton@arcor.de>
Acked-by: default avatarSteven Toth <stoth@kernellabs.com>
Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Acked-by: default avatarAndy Walls <awalls@radix.net>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarMuralidharan Karicheri <m-karicheri2@ti.com>
Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0b66cf90

drivers/media/video/cx18/cx18-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ static struct pci_driver cx18_pci_driver = { 
      .remove =   cx18_remove,

};



static int module_start(void)

static int __init module_start(void)

{

	printk(KERN_INFO "cx18:  Start initialization, version %s\n", CX18_VERSION);
@@ -1224,7 +1224,7 @@ static int module_start(void) 
	return 0;

}



static void module_cleanup(void)

static void __exit module_cleanup(void)

{

	pci_unregister_driver(&cx18_pci_driver);

}

drivers/media/video/cx23885/cx23885-core.c

+2 −2
Original line number Diff line number Diff line
@@ -2026,7 +2026,7 @@ static struct pci_driver cx23885_pci_driver = { 
	.resume   = NULL,

};



static int cx23885_init(void)

static int __init cx23885_init(void)

{

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

	       (CX23885_VERSION_CODE >> 16) & 0xff,
@@ -2039,7 +2039,7 @@ static int cx23885_init(void) 
	return pci_register_driver(&cx23885_pci_driver);

}



static void cx23885_fini(void)

static void __exit cx23885_fini(void)

{

	pci_unregister_driver(&cx23885_pci_driver);

}

drivers/media/video/davinci/dm355_ccdc.c

+2 −2
Original line number Diff line number Diff line
@@ -959,7 +959,7 @@ static struct ccdc_hw_device ccdc_hw_dev = { 
	},

};



static int dm355_ccdc_init(void)

static int __init dm355_ccdc_init(void)

{

	printk(KERN_NOTICE "dm355_ccdc_init\n");

	if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0)
@@ -969,7 +969,7 @@ static int dm355_ccdc_init(void) 
	return 0;

}



static void dm355_ccdc_exit(void)

static void __exit dm355_ccdc_exit(void)

{

	vpfe_unregister_ccdc_device(&ccdc_hw_dev);

}

drivers/media/video/davinci/dm644x_ccdc.c

+2 −2
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ static struct ccdc_hw_device ccdc_hw_dev = { 
	},

};



static int dm644x_ccdc_init(void)

static int __init dm644x_ccdc_init(void)

{

	printk(KERN_NOTICE "dm644x_ccdc_init\n");

	if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0)
@@ -869,7 +869,7 @@ static int dm644x_ccdc_init(void) 
	return 0;

}



static void dm644x_ccdc_exit(void)

static void __exit dm644x_ccdc_exit(void)

{

	vpfe_unregister_ccdc_device(&ccdc_hw_dev);

}

drivers/media/video/ivtv/ivtv-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -1361,7 +1361,7 @@ static struct pci_driver ivtv_pci_driver = { 
      .remove =   ivtv_remove,

};



static int module_start(void)

static int __init module_start(void)

{

	printk(KERN_INFO "ivtv: Start initialization, version %s\n", IVTV_VERSION);
@@ -1385,7 +1385,7 @@ static int module_start(void) 
	return 0;

}



static void module_cleanup(void)

static void __exit module_cleanup(void)

{

	pci_unregister_driver(&ivtv_pci_driver);

}