ALSA: Drop snd_get_device() helper

Since the device is no longer hidden but embedded into each component,
we no longer need snd_get_device().  Let's drop it and relevant codes.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/core.h b/include/sound/core.h
index 67ac309bb2186b832cd7edfa01185107ad8b9ae5..58882bfacdd7bd1d1e1e0308ddc1f61089224f48 100644 (file)
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -214,7 +214,6 @@ int snd_register_device(int type, struct snd_card *card, int dev,
                        void *private_data, struct device *device);
 int snd_unregister_device(struct device *dev);
 void *snd_lookup_minor_data(unsigned int minor, int type);
-struct device *snd_get_device(int type, struct snd_card *card, int dev);
 
 #ifdef CONFIG_SND_OSSEMUL
 int snd_register_oss_device(int type, struct snd_card *card, int dev,

diff --git a/sound/core/sound.c b/sound/core/sound.c
index 2e8aeb18d76b69dcac38ee8b4bc50a791273f0d0..185cec01ee258cceea232209c24b8aa5478b300b 100644 (file)
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -303,24 +303,6 @@ int snd_register_device(int type, struct snd_card *card, int dev,
 }
 EXPORT_SYMBOL(snd_register_device);
 
-/* find the matching minor record
- * return the index of snd_minor, or -1 if not found
- */
-static int find_snd_minor(int type, struct snd_card *card, int dev)
-{
-       int cardnum, minor;
-       struct snd_minor *mptr;
-
-       cardnum = card ? card->number : -1;
-       for (minor = 0; minor < ARRAY_SIZE(snd_minors); ++minor)
-               if ((mptr = snd_minors[minor]) != NULL &&
-                   mptr->type == type &&
-                   mptr->card == cardnum &&
-                   mptr->device == dev)
-                       return minor;
-       return -1;
-}
-
 /**
  * snd_unregister_device - unregister the device on the given card
  * @dev: the device instance
@@ -352,31 +334,6 @@ int snd_unregister_device(struct device *dev)
 }
 EXPORT_SYMBOL(snd_unregister_device);
 
-/**
- * snd_get_device - get the assigned device to the given type and device number
- * @type: the device type, SNDRV_DEVICE_TYPE_XXX
- * @card:the card instance
- * @dev: the device index
- *
- * The caller needs to release it via put_device() after using it.
- */
-struct device *snd_get_device(int type, struct snd_card *card, int dev)
-{
-       int minor;
-       struct device *d = NULL;
-
-       mutex_lock(&sound_mutex);
-       minor = find_snd_minor(type, card, dev);
-       if (minor >= 0) {
-               d = snd_minors[minor]->dev;
-               if (d)
-                       get_device(d);
-       }
-       mutex_unlock(&sound_mutex);
-       return d;
-}
-EXPORT_SYMBOL(snd_get_device);
-
 #ifdef CONFIG_PROC_FS
 /*
  *  INFO PART