diff options
| author | Johannes Stezenbach <js@linuxtv.org> | 2006-02-19 14:35:19 +0100 |
|---|---|---|
| committer | Johannes Stezenbach <js@linuxtv.org> | 2006-02-19 14:35:19 +0100 |
| commit | aed11c8dbfbb7fef71fca539c77fb0be7a0fb72a (patch) | |
| tree | a0f59bdf93395d1bb2e1ecd9f9af832059bcef1f | |
| parent | e94b3a5637705977fa618622221b298b8a772c8f (diff) | |
| download | mediapointer-dvb-s2-aed11c8dbfbb7fef71fca539c77fb0be7a0fb72a.tar.gz mediapointer-dvb-s2-aed11c8dbfbb7fef71fca539c77fb0be7a0fb72a.tar.bz2 | |
dvb: fix __init/__exit section references in av7110 driver
From: Johannes Stezenbach <js@linuxtv.org>
use __devinit/__devexit/__devexit_p() where appropriate
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 7 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_ir.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index 4cda49a63..90d53f962 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -2476,7 +2476,8 @@ static int frontend_init(struct av7110 *av7110) * The same behaviour of missing VSYNC can be duplicated on budget * 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; struct pci_dev *pdev = dev->pci; @@ -2826,7 +2827,7 @@ err_kfree_0: 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; dprintk(4, "%p\n", av7110); @@ -2973,7 +2974,7 @@ static struct saa7146_extension av7110_extension = { .module = THIS_MODULE, .pci_tbl = &pci_tbl[0], .attach = av7110_attach, - .detach = av7110_detach, + .detach = __devexit_p(av7110_detach), .irq_mask = MASK_19 | MASK_03 | MASK_10, .irq_func = av7110_irq, diff --git a/linux/drivers/media/dvb/ttpci/av7110_ir.c b/linux/drivers/media/dvb/ttpci/av7110_ir.c index 617e4f6c0..d54bbcdde 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_ir.c +++ b/linux/drivers/media/dvb/ttpci/av7110_ir.c @@ -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; @@ -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; |