OSDN Git Service

ALSA: compress: Drop unused functions
authorTakashi Iwai <tiwai@suse.de>
Wed, 14 Jul 2021 16:24:23 +0000 (18:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 15 Jul 2021 08:22:30 +0000 (10:22 +0200)
snd_compress_register() and snd_compress_deregister() API functions
have been never used by in-tree drivers.
Let's clean up the dead code.

Acked-by: Vinod Koul <vkoul@kernel.org>
Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20210714162424.4412-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
include/sound/compress_driver.h
sound/core/compress_offload.c

index 277087f..d91289c 100644 (file)
@@ -165,8 +165,6 @@ struct snd_compr {
 };
 
 /* compress device register APIs */
-int snd_compress_register(struct snd_compr *device);
-int snd_compress_deregister(struct snd_compr *device);
 int snd_compress_new(struct snd_card *card, int device,
                        int type, const char *id, struct snd_compr *compr);
 
index 21ce4c0..ed5546a 100644 (file)
@@ -47,8 +47,6 @@
  *     driver should be able to register multiple nodes
  */
 
-static DEFINE_MUTEX(device_mutex);
-
 struct snd_compr_file {
        unsigned long caps;
        struct snd_compr_stream stream;
@@ -1193,72 +1191,6 @@ int snd_compress_new(struct snd_card *card, int device,
 }
 EXPORT_SYMBOL_GPL(snd_compress_new);
 
-static int snd_compress_add_device(struct snd_compr *device)
-{
-       int ret;
-
-       if (!device->card)
-               return -EINVAL;
-
-       /* register the card */
-       ret = snd_card_register(device->card);
-       if (ret)
-               goto out;
-       return 0;
-
-out:
-       pr_err("failed with %d\n", ret);
-       return ret;
-
-}
-
-static int snd_compress_remove_device(struct snd_compr *device)
-{
-       return snd_card_free(device->card);
-}
-
-/**
- * snd_compress_register - register compressed device
- *
- * @device: compressed device to register
- */
-int snd_compress_register(struct snd_compr *device)
-{
-       int retval;
-
-       if (device->name == NULL || device->ops == NULL)
-               return -EINVAL;
-
-       pr_debug("Registering compressed device %s\n", device->name);
-       if (snd_BUG_ON(!device->ops->open))
-               return -EINVAL;
-       if (snd_BUG_ON(!device->ops->free))
-               return -EINVAL;
-       if (snd_BUG_ON(!device->ops->set_params))
-               return -EINVAL;
-       if (snd_BUG_ON(!device->ops->trigger))
-               return -EINVAL;
-
-       mutex_init(&device->lock);
-
-       /* register a compressed card */
-       mutex_lock(&device_mutex);
-       retval = snd_compress_add_device(device);
-       mutex_unlock(&device_mutex);
-       return retval;
-}
-EXPORT_SYMBOL_GPL(snd_compress_register);
-
-int snd_compress_deregister(struct snd_compr *device)
-{
-       pr_debug("Removing compressed device %s\n", device->name);
-       mutex_lock(&device_mutex);
-       snd_compress_remove_device(device);
-       mutex_unlock(&device_mutex);
-       return 0;
-}
-EXPORT_SYMBOL_GPL(snd_compress_deregister);
-
 MODULE_DESCRIPTION("ALSA Compressed offload framework");
 MODULE_AUTHOR("Vinod Koul <vinod.koul@linux.intel.com>");
 MODULE_LICENSE("GPL v2");