Commit 7845701820c420454bcfdc4902fad68901d9ff83
Committed by
Mauro Carvalho Chehab
Mauro Carvalho Chehab
1 parent
d5fdd1354e
Exists in
master
and in
4 other branches
V4L/DVB (4310): Saa7134: rename dmasound_{init, exit}
Two different exports with the same name are not a good idea:
$ grep -r EXPORT_SYMBOL\(dmasound_init\) *
drivers/media/video/saa7134/saa7134-core.c:EXPORT_SYMBOL(dmasound_init);
sound/oss/dmasound/dmasound_core.c:EXPORT_SYMBOL(dmasound_init);
$
This patch renames the saa7134 dmasound_{init,exit} to
saa7134_dmasound_{init,exit}.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Showing 4 changed files with 20 additions and 20 deletions Side-by-side Diff
drivers/media/video/saa7134/saa7134-alsa.c
| ... | ... | @@ -997,9 +997,9 @@ |
| 997 | 997 | struct saa7134_dev *dev = NULL; |
| 998 | 998 | struct list_head *list; |
| 999 | 999 | |
| 1000 | - if (!dmasound_init && !dmasound_exit) { | |
| 1001 | - dmasound_init = alsa_device_init; | |
| 1002 | - dmasound_exit = alsa_device_exit; | |
| 1000 | + if (!saa7134_dmasound_init && !saa7134_dmasound_exit) { | |
| 1001 | + saa7134_dmasound_init = alsa_device_init; | |
| 1002 | + saa7134_dmasound_exit = alsa_device_exit; | |
| 1003 | 1003 | } else { |
| 1004 | 1004 | printk(KERN_WARNING "saa7134 ALSA: can't load, DMA sound handler already assigned (probably to OSS)\n"); |
| 1005 | 1005 | return -EBUSY; |
| ... | ... | @@ -1036,8 +1036,8 @@ |
| 1036 | 1036 | snd_card_free(snd_saa7134_cards[idx]); |
| 1037 | 1037 | } |
| 1038 | 1038 | |
| 1039 | - dmasound_init = NULL; | |
| 1040 | - dmasound_exit = NULL; | |
| 1039 | + saa7134_dmasound_init = NULL; | |
| 1040 | + saa7134_dmasound_exit = NULL; | |
| 1041 | 1041 | printk(KERN_INFO "saa7134 ALSA driver for DMA sound unloaded\n"); |
| 1042 | 1042 | |
| 1043 | 1043 | return; |
drivers/media/video/saa7134/saa7134-core.c
| ... | ... | @@ -95,8 +95,8 @@ |
| 95 | 95 | static LIST_HEAD(mops_list); |
| 96 | 96 | static unsigned int saa7134_devcount; |
| 97 | 97 | |
| 98 | -int (*dmasound_init)(struct saa7134_dev *dev); | |
| 99 | -int (*dmasound_exit)(struct saa7134_dev *dev); | |
| 98 | +int (*saa7134_dmasound_init)(struct saa7134_dev *dev); | |
| 99 | +int (*saa7134_dmasound_exit)(struct saa7134_dev *dev); | |
| 100 | 100 | |
| 101 | 101 | #define dprintk(fmt, arg...) if (core_debug) \ |
| 102 | 102 | printk(KERN_DEBUG "%s/core: " fmt, dev->name , ## arg) |
| ... | ... | @@ -1008,8 +1008,8 @@ |
| 1008 | 1008 | /* check for signal */ |
| 1009 | 1009 | saa7134_irq_video_intl(dev); |
| 1010 | 1010 | |
| 1011 | - if (dmasound_init && !dev->dmasound.priv_data) { | |
| 1012 | - dmasound_init(dev); | |
| 1011 | + if (saa7134_dmasound_init && !dev->dmasound.priv_data) { | |
| 1012 | + saa7134_dmasound_init(dev); | |
| 1013 | 1013 | } |
| 1014 | 1014 | |
| 1015 | 1015 | return 0; |
| ... | ... | @@ -1036,8 +1036,8 @@ |
| 1036 | 1036 | struct saa7134_mpeg_ops *mops; |
| 1037 | 1037 | |
| 1038 | 1038 | /* Release DMA sound modules if present */ |
| 1039 | - if (dmasound_exit && dev->dmasound.priv_data) { | |
| 1040 | - dmasound_exit(dev); | |
| 1039 | + if (saa7134_dmasound_exit && dev->dmasound.priv_data) { | |
| 1040 | + saa7134_dmasound_exit(dev); | |
| 1041 | 1041 | } |
| 1042 | 1042 | |
| 1043 | 1043 | /* debugging ... */ |
| ... | ... | @@ -1169,8 +1169,8 @@ |
| 1169 | 1169 | |
| 1170 | 1170 | /* ----------------- for the DMA sound modules --------------- */ |
| 1171 | 1171 | |
| 1172 | -EXPORT_SYMBOL(dmasound_init); | |
| 1173 | -EXPORT_SYMBOL(dmasound_exit); | |
| 1172 | +EXPORT_SYMBOL(saa7134_dmasound_init); | |
| 1173 | +EXPORT_SYMBOL(saa7134_dmasound_exit); | |
| 1174 | 1174 | EXPORT_SYMBOL(saa7134_pgtable_free); |
| 1175 | 1175 | EXPORT_SYMBOL(saa7134_pgtable_build); |
| 1176 | 1176 | EXPORT_SYMBOL(saa7134_pgtable_alloc); |
drivers/media/video/saa7134/saa7134-oss.c
| ... | ... | @@ -993,9 +993,9 @@ |
| 993 | 993 | struct saa7134_dev *dev = NULL; |
| 994 | 994 | struct list_head *list; |
| 995 | 995 | |
| 996 | - if (!dmasound_init && !dmasound_exit) { | |
| 997 | - dmasound_init = oss_device_init; | |
| 998 | - dmasound_exit = oss_device_exit; | |
| 996 | + if (!saa7134_dmasound_init && !saa7134_dmasound_exit) { | |
| 997 | + saa7134_dmasound_init = oss_device_init; | |
| 998 | + saa7134_dmasound_exit = oss_device_exit; | |
| 999 | 999 | } else { |
| 1000 | 1000 | printk(KERN_WARNING "saa7134 OSS: can't load, DMA sound handler already assigned (probably to ALSA)\n"); |
| 1001 | 1001 | return -EBUSY; |
| ... | ... | @@ -1037,8 +1037,8 @@ |
| 1037 | 1037 | |
| 1038 | 1038 | } |
| 1039 | 1039 | |
| 1040 | - dmasound_init = NULL; | |
| 1041 | - dmasound_exit = NULL; | |
| 1040 | + saa7134_dmasound_init = NULL; | |
| 1041 | + saa7134_dmasound_exit = NULL; | |
| 1042 | 1042 | |
| 1043 | 1043 | printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n"); |
| 1044 | 1044 |
drivers/media/video/saa7134/saa7134.h
| ... | ... | @@ -586,8 +586,8 @@ |
| 586 | 586 | |
| 587 | 587 | int saa7134_set_dmabits(struct saa7134_dev *dev); |
| 588 | 588 | |
| 589 | -extern int (*dmasound_init)(struct saa7134_dev *dev); | |
| 590 | -extern int (*dmasound_exit)(struct saa7134_dev *dev); | |
| 589 | +extern int (*saa7134_dmasound_init)(struct saa7134_dev *dev); | |
| 590 | +extern int (*saa7134_dmasound_exit)(struct saa7134_dev *dev); | |
| 591 | 591 | |
| 592 | 592 | |
| 593 | 593 | /* ----------------------------------------------------------- */ |