Skip to contentSkip to conversation

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

PATCH Applied Rosen Penev 2 participants 2 messages Apr 30 – May 4 Sound

lore
Share & tools
lore
#0 lore raw

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

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.

---
 sound/core/seq/oss/seq_oss_readq.c | 13 ++-----------
 sound/core/seq/oss/seq_oss_readq.h |  3 ++-
 2 files changed, 4 insertions(+), 12 deletions(-)
sound/core/seq/oss/seq_oss_readq.c +2 -11
index c880d4771169..6b474615ced8 100644
@@ -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);
 }
 
 /*
sound/core/seq/oss/seq_oss_readq.h +2 -1
index 38d0c4682b29..d8e1e7504d8f 100644
@@ -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);
Signature · 1 line
2.54.0
Applied
#1 lore raw
Quoted 8 lines · Rosen Penev

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.

Applied to for-next branch. Thanks.

Takashi