[PATCH] move snd_legacy_find_free_ioport to opti92x-ad1848.c

From:  Marcus Alanen <maalanen@ra.abo.fi>

  Moves the snd_legacy_find_free_ioport definition to opti92x-ad1848.c,
  since it is the only user.

diff --git a/include/sound/initval.h b/include/sound/initval.h
index 2cced5c7eb060065849d38b576000c5aefc5e7ef..4cc972dd71eed42a0e3dc3ff7e2c8b76d52ee2bf 100644 (file)
--- a/include/sound/initval.h
+++ b/include/sound/initval.h
@@ -97,18 +97,6 @@ static int snd_legacy_auto_probe(unsigned long *ports, int (*probe)(unsigned lon
 }
 #endif
 
-#ifdef SNDRV_LEGACY_FIND_FREE_IOPORT
-static long snd_legacy_find_free_ioport(long *port_table, long size)
-{
-       while (*port_table != -1) {
-               if (!check_region(*port_table, size))
-                       return *port_table;
-               port_table++;
-       }
-       return -1;
-}
-#endif
-
 #ifdef SNDRV_LEGACY_FIND_FREE_IRQ
 #include <linux/interrupt.h>
 

diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 648f7c083fdb941e2851e5c291fe2d5f482ab5dd..b1d48c8eb882c9369fc9e04a65496c903cc62abb 100644 (file)
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -47,7 +47,6 @@
 #endif /* CS4231 */
 #include <sound/mpu401.h>
 #include <sound/opl3.h>
-#define SNDRV_LEGACY_FIND_FREE_IOPORT
 #define SNDRV_LEGACY_FIND_FREE_IRQ
 #define SNDRV_LEGACY_FIND_FREE_DMA
 #define SNDRV_GET_ID
@@ -324,6 +323,16 @@ static char * snd_opti9xx_names[] = {
 };
 
 
+static long snd_legacy_find_free_ioport(long *port_table, long size)
+{
+       while (*port_table != -1) {
+               if (!check_region(*port_table, size))
+                       return *port_table;
+               port_table++;
+       }
+       return -1;
+}
+
 static int __init snd_opti9xx_init(opti9xx_t *chip, unsigned short hardware)
 {
        static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};