private_free fixes

diff --git a/include/pcm.h b/include/pcm.h
index 29df6a35cdaa687ab85aabac672ab491cfa0eb96..69e1e2ca1100e907c21e5bc50dfbd3777757805d 100644 (file)
--- a/include/pcm.h
+++ b/include/pcm.h
@@ -284,7 +284,7 @@ struct snd_stru_pcm_plugin {
        snd_pcm_plugin_t *next;
        snd_pcm_plug_t *plug;
        void *private_data;
-       void (*private_free)(snd_pcm_plugin_t *plugin, void *private_data);
+       void (*private_free)(snd_pcm_plugin_t *plugin);
        char *buf;
        size_t buf_frames;
        snd_pcm_plugin_channel_t *buf_channels;

diff --git a/src/pcm/pcm_common.c b/src/pcm/pcm_common.c
index b8ed0b01b70665870290045e836943c0254d8f75..ae947ecf89914854c77953a79a5a9c007dcb98ae 100644 (file)
--- a/src/pcm/pcm_common.c
+++ b/src/pcm/pcm_common.c
@@ -210,7 +210,7 @@ int snd_pcm_plugin_free(snd_pcm_plugin_t *plugin)
 {
        assert(plugin);
        if (plugin->private_free)
-               plugin->private_free(plugin, plugin->private_data);
+               plugin->private_free(plugin);
        if (plugin->name)
                free(plugin->name);
        free(plugin->buf_channels);

diff --git a/src/pcm/plugin/mmap.c b/src/pcm/plugin/mmap.c
index d2742aa1bd4ba9f11f590c5ecdd330f5e66f8b9e..8fead5a80ad84d27fa073584ee14fbde5858b1ae 100644 (file)
--- a/src/pcm/plugin/mmap.c
+++ b/src/pcm/plugin/mmap.c
@@ -258,7 +258,7 @@ static int mmap_action(snd_pcm_plugin_t *plugin,
        return 0;       /* silenty ignore other actions */
 }
 
-static void mmap_free(snd_pcm_plugin_t *plugin, void *private_data ATTRIBUTE_UNUSED)
+static void mmap_free(snd_pcm_plugin_t *plugin)
 {
        struct mmap_private_data *data;
 

diff --git a/src/pcm/plugin/route.c b/src/pcm/plugin/route.c
index 6a5447d4e21c03350d0ff9aad516ad4b088e6fbc..448c47d80fd74fbcffb8518cf10decba311c139d 100644 (file)
--- a/src/pcm/plugin/route.c
+++ b/src/pcm/plugin/route.c
@@ -410,7 +410,7 @@ int route_dst_channels_mask(snd_pcm_plugin_t *plugin,
        return 0;
 }
 
-static void route_free(snd_pcm_plugin_t *plugin, void* private_data ATTRIBUTE_UNUSED)
+static void route_free(snd_pcm_plugin_t *plugin)
 {
        route_t *data = (route_t *)plugin->extra_data;
        unsigned int dst_channel;