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

Commit 11dc3ffa authored by Johannes Stezenbach's avatar Johannes Stezenbach Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3385): Dvb: fix __init/__exit section references in av7110 driver 



use __devinit/__devexit/__devexit_p() where appropriate

Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 14c255b2

drivers/media/dvb/ttpci/av7110.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -2477,7 +2477,8 @@ static int frontend_init(struct av7110 *av7110) 
 * The same behaviour of missing VSYNC can be duplicated on budget

 * The same behaviour of missing VSYNC can be duplicated on budget

 * cards, by seting DD1_INIT trigger mode 7 in 3rd nibble.

 * cards, by seting DD1_INIT trigger mode 7 in 3rd nibble.

 */

 */

static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *pci_ext)

static int __devinit av7110_attach(struct saa7146_dev* dev,

				   struct saa7146_pci_extension_data *pci_ext)

{

{

	const int length = TS_WIDTH * TS_HEIGHT;

	const int length = TS_WIDTH * TS_HEIGHT;

	struct pci_dev *pdev = dev->pci;

	struct pci_dev *pdev = dev->pci;
@@ -2827,7 +2828,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d 
	goto out;

	goto out;

}

}





static int av7110_detach(struct saa7146_dev* saa)

static int __devexit av7110_detach(struct saa7146_dev* saa)

{

{

	struct av7110 *av7110 = saa->ext_priv;

	struct av7110 *av7110 = saa->ext_priv;

	dprintk(4, "%p\n", av7110);

	dprintk(4, "%p\n", av7110);
@@ -2974,7 +2975,7 @@ static struct saa7146_extension av7110_extension = { 
	.module		= THIS_MODULE,

	.module		= THIS_MODULE,

	.pci_tbl	= &pci_tbl[0],

	.pci_tbl	= &pci_tbl[0],

	.attach		= av7110_attach,

	.attach		= av7110_attach,

	.detach		= av7110_detach,

	.detach		= __devexit_p(av7110_detach),





	.irq_mask	= MASK_19 | MASK_03 | MASK_10,

	.irq_mask	= MASK_19 | MASK_03 | MASK_10,

	.irq_func	= av7110_irq,

	.irq_func	= av7110_irq,

drivers/media/dvb/ttpci/av7110_ir.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -208,7 +208,7 @@ static void ir_handler(struct av7110 *av7110, u32 ircom) 
}

}









int __init av7110_ir_init(struct av7110 *av7110)

int __devinit av7110_ir_init(struct av7110 *av7110)

{

{

	static struct proc_dir_entry *e;

	static struct proc_dir_entry *e;
@@ -248,7 +248,7 @@ int __init av7110_ir_init(struct av7110 *av7110) 
}

}









void __exit av7110_ir_exit(struct av7110 *av7110)

void __devexit av7110_ir_exit(struct av7110 *av7110)

{

{

	int i;

	int i;