Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / sound / initval.h

diff --git a/include/sound/initval.h b/include/sound/initval.h
index f400084..d29e3d3 100644 (file)
--- a/include/sound/initval.h
+++ b/include/sound/initval.h
@@ -21,20 +21,6 @@
  *
  */
 
-#ifndef MODULE_GENERIC_STRING
-#ifdef MODULE
-#define MODULE_GENERIC_STRING(name, string) \
-static const char __module_generic_string_##name [] \
-  __attribute__ ((unused, __section__(".modstring"))) = #name "=" string;
-#else
-#define MODULE_GENERIC_STRING(name, string)
-#endif
-#endif
-
-#define MODULE_CLASSES(val) MODULE_GENERIC_STRING(info_classes, val)
-#define MODULE_DEVICES(val) MODULE_GENERIC_STRING(info_devices, val)
-#define MODULE_PARM_SYNTAX(id, val) MODULE_GENERIC_STRING(info_parm_##id, val)
-
 #define SNDRV_AUTO_PORT                1
 #define SNDRV_AUTO_IRQ         0xffff
 #define SNDRV_AUTO_DMA         0xffff
@@ -64,39 +50,6 @@ static const char __module_generic_string_##name [] \
 #define SNDRV_DEFAULT_DMA_SIZE { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA_SIZE }
 #define SNDRV_DEFAULT_PTR      SNDRV_DEFAULT_STR
 
-#define SNDRV_BOOLEAN_TRUE_DESC        "allows:{{0,Disabled},{1,Enabled}},default:1,dialog:check"
-#define SNDRV_BOOLEAN_FALSE_DESC "allows:{{0,Disabled},{1,Enabled}},default:0,dialog:check"
-
-#define SNDRV_ENABLED          "enable:(enable)"
-
-#define SNDRV_INDEX_DESC       SNDRV_ENABLED ",allows:{{0,7}},unique,skill:required,dialog:list"
-#define SNDRV_ID_DESC          SNDRV_ENABLED ",unique"
-#define SNDRV_ENABLE_DESC      SNDRV_BOOLEAN_FALSE_DESC
-#define SNDRV_ISAPNP_DESC      SNDRV_ENABLED "," SNDRV_BOOLEAN_TRUE_DESC
-#define SNDRV_DMA8_DESC                SNDRV_ENABLED ",allows:{{0,1},{3}},dialog:list"
-#define SNDRV_DMA16_DESC       SNDRV_ENABLED ",allows:{{5,7}},dialog:list"
-#define SNDRV_DMA_DESC         SNDRV_ENABLED ",allows:{{0,1},{3},{5,7}},dialog:list"
-#define SNDRV_IRQ_DESC         SNDRV_ENABLED ",allows:{{5},{7},{9},{10,12},{14,15}},dialog:list"
-#define SNDRV_DMA_SIZE_DESC    SNDRV_ENABLED ",allows:{{4,128}},default:64,skill:advanced"
-#define SNDRV_DMA8_SIZE_DESC   SNDRV_ENABLED ",allows:{{4, 64}},default:64,skill:advanced"
-#define SNDRV_DMA16_SIZE_DESC  SNDRV_ENABLED ",allows:{{4,128}},default:64,skill:advanced"
-#define SNDRV_PORT12_DESC      SNDRV_ENABLED ",allows:{{0,0x3fff}},base:16"
-#define SNDRV_PORT_DESC                SNDRV_ENABLED ",allows:{{0,0xffff}},base:16"
-
-#ifdef SNDRV_LEGACY_AUTO_PROBE
-static int snd_legacy_auto_probe(unsigned long *ports, int (*probe)(unsigned long port))
-{
-       int result = 0; /* number of detected cards */
-
-       while ((signed long)*ports != -1) {
-               if (probe(*ports) >= 0)
-                       result++;
-               ports++;
-       }
-       return result;
-}
-#endif
-
 #ifdef SNDRV_LEGACY_FIND_FREE_IRQ
 #include <linux/interrupt.h>
 
@@ -133,44 +86,4 @@ static int snd_legacy_find_free_dma(int *dma_table)
 }
 #endif
 
-#if defined(SNDRV_GET_ID) && !defined(MODULE)
-#include <linux/ctype.h>
-#include <linux/init.h>
-#include <linux/bootmem.h>
-static int __init get_id(char **str, char **dst)
-{
-       char *s;
-
-       if (!(*str) || !(**str))
-               return 0;
-       for (s = *str; isalpha(*s) || isdigit(*s) || *s == '_'; s++);
-       if (s != *str) {
-               int len = s - *str;
-               char *d = (char *)alloc_bootmem(len + 1);
-               if (d != NULL) {
-                       memcpy(*dst = d, *str, len);
-                       d[len] = '\0';
-               }
-       }
-       if (*s == ',') {
-               *str = s + 1;
-               return 2;
-       }
-       *str = s;
-       return 1;
-}
-#endif
-
-/* simple wrapper for long variable.
- * the value more than 32bit won't work!
- */
-inline static int get_option_long(char **str, long *valp)
-{
-       int val, ret;
-       ret = get_option(str, &val);
-       if (ret)
-               *valp = val;
-       return ret;
-}
-
 #endif /* __SOUND_INITVAL_H */