ALSA: seq: remove useless function

The function snd_seq_queue_client_termination() is only called from
the function seq_free_client1(). The function seq_free_client1() calls
the function snd_seq_queue_client_leave() and the function
snd_seq_queue_client_termination() together. Because the function
snd_seq_queue_client_leave() does all things, so the function
snd_seq_queue_client_termination() is a useless function.

Signed-off-by: Yu Hao <yuhaobehappy@gmail.com>
Link: https://lore.kernel.org/r/20201103223335.21831-1-yuhaobehappy@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index cc93157fa950045b8d74e2fc4a6b1dc4e7753a5d..f9f2fea58b32cf3d81e9b7695a10bcd8c52e3e51 100644 (file)
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -279,7 +279,6 @@ static int seq_free_client1(struct snd_seq_client *client)
        snd_seq_delete_all_ports(client);
        snd_seq_queue_client_leave(client->number);
        snd_use_lock_sync(&client->use_lock);
-       snd_seq_queue_client_termination(client->number);
        if (client->pool)
                snd_seq_pool_delete(&client->pool);
        spin_lock_irq(&clients_lock);

diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c
index 71a6ea62c3be7c8a0a1885da0b32b2b527ef8644..13cfc2d47fa784c627500d89a2c8894a1213ec0f 100644 (file)
--- a/sound/core/seq/seq_queue.c
+++ b/sound/core/seq/seq_queue.c
@@ -537,33 +537,6 @@ int snd_seq_queue_is_used(int queueid, int client)
 
 /*----------------------------------------------------------------*/
 
-/* notification that client has left the system -
- * stop the timer on all queues owned by this client
- */
-void snd_seq_queue_client_termination(int client)
-{
-       unsigned long flags;
-       int i;
-       struct snd_seq_queue *q;
-       bool matched;
-
-       for (i = 0; i < SNDRV_SEQ_MAX_QUEUES; i++) {
-               if ((q = queueptr(i)) == NULL)
-                       continue;
-               spin_lock_irqsave(&q->owner_lock, flags);
-               matched = (q->owner == client);
-               if (matched)
-                       q->klocked = 1;
-               spin_unlock_irqrestore(&q->owner_lock, flags);
-               if (matched) {
-                       if (q->timer->running)
-                               snd_seq_timer_stop(q->timer);
-                       snd_seq_timer_reset(q->timer);
-               }
-               queuefree(q);
-       }
-}
-
 /* final stage notification -
  * remove cells for no longer exist client (for non-owned queue)
  * or delete this queue (for owned queue)

diff --git a/sound/core/seq/seq_queue.h b/sound/core/seq/seq_queue.h
index 9254c8dbe5e3796a358f1725fd31192fd1e4c13d..1c3a8d3254d90db2c5ac177e17e590a703fa15b7 100644 (file)
--- a/sound/core/seq/seq_queue.h
+++ b/sound/core/seq/seq_queue.h
@@ -59,9 +59,6 @@ struct snd_seq_queue *snd_seq_queue_alloc(int client, int locked, unsigned int f
 /* delete queue (destructor) */
 int snd_seq_queue_delete(int client, int queueid);
 
-/* notification that client has left the system */
-void snd_seq_queue_client_termination(int client);
-
 /* final stage */
 void snd_seq_queue_client_leave(int client);