From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 9 Aug 2024 12:25:16 +0000 (+0200)
Subject: Merge branch 'topic/control-lookup-rwlock' into for-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4004f3029e1f612903f03df497153c90a2752130;p=users%2Fwilly%2Flinux.git

Merge branch 'topic/control-lookup-rwlock' into for-next

Pull control lookup optimization changes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

4004f3029e1f612903f03df497153c90a2752130
diff --cc sound/core/control.c
index f668826649b3,38728b00f59c..7d7d592a8428
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@@ -1303,10 -1267,10 +1270,10 @@@ static int snd_ctl_elem_write(struct sn
  	struct snd_kcontrol *kctl;
  	struct snd_kcontrol_volatile *vd;
  	unsigned int index_offset;
 -	int result;
 +	int result = 0;
  
  	down_write(&card->controls_rwsem);
- 	kctl = snd_ctl_find_id_locked(card, &control->id);
+ 	kctl = snd_ctl_find_id(card, &control->id);
  	if (kctl == NULL) {
  		up_write(&card->controls_rwsem);
  		return -ENOENT;
diff --cc sound/core/seq/seq_ports.h
index 20a26bffecb7,9e36738c0dd0..b3b35018cb82
--- a/sound/core/seq/seq_ports.h
+++ b/sound/core/seq/seq_ports.h
@@@ -87,10 -77,8 +77,10 @@@ struct snd_seq_client_port 
  	unsigned char direction;
  	unsigned char ump_group;
  
 +	bool is_midi1;	/* keep MIDI 1.0 protocol */
 +
  #if IS_ENABLED(CONFIG_SND_SEQ_UMP)
- 	struct snd_seq_ump_midi2_bank midi2_bank[16]; /* per channel */
+ 	struct ump_cvt_to_ump_bank midi2_bank[16]; /* per channel */
  #endif
  };