ALSA: Use priority list for managing device list

[firefly-linux-kernel-4.4.55.git] / include / sound / core.h

diff --git a/include/sound/core.h b/include/sound/core.h
index 9c11873341954c46915c80b0d62aa1967caa572b..f1e41f4b067f429e4c62b0a084421868201f1a5b 100644 (file)
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -46,24 +46,22 @@ struct completion;
 
 /* device allocation stuff */
 
-#define SNDRV_DEV_TYPE_RANGE_SIZE              0x1000
-
+/* type of the object used in snd_device_*()
+ * this also defines the calling order
+ */
 enum snd_device_type {
-       SNDRV_DEV_TOPLEVEL      = 0,
-       SNDRV_DEV_CONTROL       = 1,
-       SNDRV_DEV_LOWLEVEL_PRE  = 2,
-       SNDRV_DEV_LOWLEVEL_NORMAL = 0x1000,
+       SNDRV_DEV_LOWLEVEL,
+       SNDRV_DEV_CONTROL,
+       SNDRV_DEV_INFO,
+       SNDRV_DEV_BUS,
+       SNDRV_DEV_CODEC,
        SNDRV_DEV_PCM,
+       SNDRV_DEV_COMPRESS,
        SNDRV_DEV_RAWMIDI,
        SNDRV_DEV_TIMER,
        SNDRV_DEV_SEQUENCER,
        SNDRV_DEV_HWDEP,
-       SNDRV_DEV_INFO,
-       SNDRV_DEV_BUS,
-       SNDRV_DEV_CODEC,
        SNDRV_DEV_JACK,
-       SNDRV_DEV_COMPRESS,
-       SNDRV_DEV_LOWLEVEL      = 0x2000,
 };
 
 enum snd_device_state {
@@ -72,12 +70,6 @@ enum snd_device_state {
        SNDRV_DEV_DISCONNECTED,
 };
 
-enum snd_device_cmd {
-       SNDRV_DEV_CMD_PRE,
-       SNDRV_DEV_CMD_NORMAL,
-       SNDRV_DEV_CMD_POST,
-};
-
 struct snd_device;
 
 struct snd_device_ops {
@@ -320,7 +312,7 @@ int snd_device_register_all(struct snd_card *card);
 int snd_device_disconnect(struct snd_card *card, void *device_data);
 int snd_device_disconnect_all(struct snd_card *card);
 int snd_device_free(struct snd_card *card, void *device_data);
-int snd_device_free_all(struct snd_card *card, enum snd_device_cmd cmd);
+int snd_device_free_all(struct snd_card *card);
 
 /* isadma.c */