diff options
author | Johannes Stezenbach <js@linuxtv.org> | 2006-02-26 22:09:20 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-26 22:09:20 -0500 |
commit | 1be11e367f25d3874276d56d1c4ffed5b3cc3bb9 (patch) | |
tree | 147c7388a819c07dcfd5d65d1ada9155a708f178 /drivers | |
parent | 981a16f185bdf105f0d411d87f5c276d3da60e64 (diff) |
V4L/DVB (3385): Dvb: fix __init/__exit section references in av7110 driver
use __devinit/__devexit/__devexit_p() where appropriate
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110.c | 7 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_ir.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index 1aa61bf29ad6..d982a50cdd7f 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
@@ -2476,7 +2476,8 @@ static int frontend_init(struct av7110 *av7110) | |||
2476 | * The same behaviour of missing VSYNC can be duplicated on budget | 2476 | * The same behaviour of missing VSYNC can be duplicated on budget |
2477 | * cards, by seting DD1_INIT trigger mode 7 in 3rd nibble. | 2477 | * cards, by seting DD1_INIT trigger mode 7 in 3rd nibble. |
2478 | */ | 2478 | */ |
2479 | static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *pci_ext) | 2479 | static int __devinit av7110_attach(struct saa7146_dev* dev, |
2480 | struct saa7146_pci_extension_data *pci_ext) | ||
2480 | { | 2481 | { |
2481 | const int length = TS_WIDTH * TS_HEIGHT; | 2482 | const int length = TS_WIDTH * TS_HEIGHT; |
2482 | struct pci_dev *pdev = dev->pci; | 2483 | struct pci_dev *pdev = dev->pci; |
@@ -2826,7 +2827,7 @@ err_kfree_0: | |||
2826 | goto out; | 2827 | goto out; |
2827 | } | 2828 | } |
2828 | 2829 | ||
2829 | static int av7110_detach(struct saa7146_dev* saa) | 2830 | static int __devexit av7110_detach(struct saa7146_dev* saa) |
2830 | { | 2831 | { |
2831 | struct av7110 *av7110 = saa->ext_priv; | 2832 | struct av7110 *av7110 = saa->ext_priv; |
2832 | dprintk(4, "%p\n", av7110); | 2833 | dprintk(4, "%p\n", av7110); |
@@ -2973,7 +2974,7 @@ static struct saa7146_extension av7110_extension = { | |||
2973 | .module = THIS_MODULE, | 2974 | .module = THIS_MODULE, |
2974 | .pci_tbl = &pci_tbl[0], | 2975 | .pci_tbl = &pci_tbl[0], |
2975 | .attach = av7110_attach, | 2976 | .attach = av7110_attach, |
2976 | .detach = av7110_detach, | 2977 | .detach = __devexit_p(av7110_detach), |
2977 | 2978 | ||
2978 | .irq_mask = MASK_19 | MASK_03 | MASK_10, | 2979 | .irq_mask = MASK_19 | MASK_03 | MASK_10, |
2979 | .irq_func = av7110_irq, | 2980 | .irq_func = av7110_irq, |
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c index 617e4f6c0ed7..d54bbcdde2cc 100644 --- a/drivers/media/dvb/ttpci/av7110_ir.c +++ b/drivers/media/dvb/ttpci/av7110_ir.c | |||
@@ -208,7 +208,7 @@ static void ir_handler(struct av7110 *av7110, u32 ircom) | |||
208 | } | 208 | } |
209 | 209 | ||
210 | 210 | ||
211 | int __init av7110_ir_init(struct av7110 *av7110) | 211 | int __devinit av7110_ir_init(struct av7110 *av7110) |
212 | { | 212 | { |
213 | static struct proc_dir_entry *e; | 213 | static struct proc_dir_entry *e; |
214 | 214 | ||
@@ -248,7 +248,7 @@ int __init av7110_ir_init(struct av7110 *av7110) | |||
248 | } | 248 | } |
249 | 249 | ||
250 | 250 | ||
251 | void __exit av7110_ir_exit(struct av7110 *av7110) | 251 | void __devexit av7110_ir_exit(struct av7110 *av7110) |
252 | { | 252 | { |
253 | int i; | 253 | int i; |
254 | 254 | ||