github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ALSA: seq: oss/rw: allocate evrec with main struct

Browse Source 
Use a flexible array member to simplify allocation slightly.

Add the header as flexible array members require full definitions.

Remove null check and just kfree. The former is not needed.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://patch.msgid.link/20260430210413.31185-1-rosenp@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Rosen Penev 2026-04-30 14:04:13 -07:00 committed by Takashi Iwai
parent 4ce505c490
commit 1595a5b8c5
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/core/seq/oss/seq_oss_readq.c
View File

@ -34,16 +34,10 @@ snd_seq_oss_readq_new(struct seq_oss_devinfo *dp, int maxlen)
{
struct seq_oss_readq *q;
q = kzalloc_obj(*q);
q = kzalloc_flex(*q, q, maxlen);
if (!q)
return NULL;
q->q = kzalloc_objs(union evrec, maxlen);
if (!q->q) {
kfree(q);
return NULL;
}
q->maxlen = maxlen;
q->qlen = 0;
q->head = q->tail = 0;
@ -61,10 +55,7 @@ snd_seq_oss_readq_new(struct seq_oss_devinfo *dp, int maxlen)
void
snd_seq_oss_readq_delete(struct seq_oss_readq *q)
{
if (q) {
kfree(q->q);
kfree(q);
}
kfree(q);
}
/*

3
sound/core/seq/oss/seq_oss_readq.h
View File

@ -10,13 +10,13 @@
#define __SEQ_OSS_READQ_H
#include "seq_oss_device.h"
#include "seq_oss_event.h"
/*
* definition of read queue
*/
struct seq_oss_readq {
union evrec *q;
int qlen;
int maxlen;
int head, tail;
@ -24,6 +24,7 @@ struct seq_oss_readq {
unsigned long input_time;
wait_queue_head_t midi_sleep;
spinlock_t lock;
union evrec q[] __counted_by(maxlen);
};
struct seq_oss_readq *snd_seq_oss_readq_new(struct seq_oss_devinfo *dp, int maxlen);