saa7134: rename dmasound_{init,exit}
PATCH 1/1 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 <[email protected]>
---
drivers/media/video/saa7134/saa7134-alsa.c | 10 +++++----- drivers/media/video/saa7134/saa7134-core.c | 16 ++++++++-------- drivers/media/video/saa7134/saa7134-oss.c | 10 +++++----- drivers/media/video/saa7134/saa7134.h | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-)
drivers/media/video/saa7134/saa7134.h renamed from drivers/media/video/saa7134/saa7134.h.old +2 -2
@@ -586,8 +586,8 @@int saa7134_set_dmabits (struct saa7134_dev *dev); -extern int (*dmasound_init)(struct saa7134_dev *dev); -extern int (*dmasound_exit)(struct saa7134_dev *dev); +extern int (*saa7134_dmasound_init)(struct saa7134_dev *dev); +extern int (*saa7134_dmasound_exit)(struct saa7134_dev *dev);/* ----------------------------------------------------------- */
drivers/media/video/saa7134/saa7134-core.c renamed from drivers/media/video/saa7134/saa7134-core.c.old +8 -8
@@ -95,8 +95,8 @@static LIST_HEAD (mops_list);static unsigned int saa7134_devcount; -int (*dmasound_init)(struct saa7134_dev *dev); -int (*dmasound_exit)(struct saa7134_dev *dev); +int (*saa7134_dmasound_init)(struct saa7134_dev *dev); +int (*saa7134_dmasound_exit)(struct saa7134_dev *dev); #define dprintk(fmt, arg...) if (core_debug) \ printk(KERN_DEBUG "%s/core: " fmt, dev->name , ## arg)
@@ -1008,8 +1008,8 @@/* check for signal */ saa7134_irq_video_intl (dev); -if (dmasound_init && !dev->dmasound.priv_data) { -dmasound_init (dev); +if (saa7134_dmasound_init && !dev->dmasound.priv_data) { +saa7134_dmasound_init (dev); }return 0 ;
@@ -1036,8 +1036,8 @@struct saa7134_mpeg_ops *mops;/* Release DMA sound modules if present */ -if (dmasound_exit && dev->dmasound.priv_data) { -dmasound_exit (dev); +if (saa7134_dmasound_exit && dev->dmasound.priv_data) { +saa7134_dmasound_exit (dev); }/* debugging ... */
@@ -1169,8 +1169,8 @@/* ----------------- for the DMA sound modules --------------- */ -EXPORT_SYMBOL (dmasound_init); -EXPORT_SYMBOL (dmasound_exit); +EXPORT_SYMBOL (saa7134_dmasound_init); +EXPORT_SYMBOL (saa7134_dmasound_exit);EXPORT_SYMBOL (saa7134_pgtable_free);EXPORT_SYMBOL (saa7134_pgtable_build);EXPORT_SYMBOL (saa7134_pgtable_alloc);
drivers/media/video/saa7134/saa7134-alsa.c renamed from drivers/media/video/saa7134/saa7134-alsa.c.old +5 -5
@@ -997,9 +997,9 @@struct saa7134_dev *dev =NULL ;struct list_head *list; -if (!dmasound_init && !dmasound_exit) { - dmasound_init = alsa_device_init; - dmasound_exit = alsa_device_exit; +if (!saa7134_dmasound_init && !saa7134_dmasound_exit) { + saa7134_dmasound_init = alsa_device_init; + saa7134_dmasound_exit = alsa_device_exit; }else {printk (KERN_WARNING "saa7134 ALSA: can't load, DMA sound handler already assigned (probably to OSS)\n" );return -EBUSY ;
@@ -1036,8 +1036,8 @@snd_card_free (snd_saa7134_cards[idx]); } - dmasound_init =NULL ; - dmasound_exit =NULL ; + saa7134_dmasound_init =NULL ; + saa7134_dmasound_exit =NULL ;printk (KERN_INFO "saa7134 ALSA driver for DMA sound unloaded\n" );return ;
drivers/media/video/saa7134/saa7134-oss.c renamed from drivers/media/video/saa7134/saa7134-oss.c.old +5 -5
@@ -993,9 +993,9 @@struct saa7134_dev *dev =NULL ;struct list_head *list; -if (!dmasound_init && !dmasound_exit) { - dmasound_init = oss_device_init; - dmasound_exit = oss_device_exit; +if (!saa7134_dmasound_init && !saa7134_dmasound_exit) { + saa7134_dmasound_init = oss_device_init; + saa7134_dmasound_exit = oss_device_exit; }else {printk (KERN_WARNING "saa7134 OSS: can't load, DMA sound handler already assigned (probably to ALSA)\n" );return -EBUSY ;
@@ -1037,8 +1037,8 @@ } - dmasound_init =NULL ; - dmasound_exit =NULL ; + saa7134_dmasound_init =NULL ; + saa7134_dmasound_exit =NULL ;printk (KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n" );