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

Pull control lookup optimization changes.

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

diff --cc include/sound/control.h
Simple merge

diff --cc include/sound/core.h
Simple merge

diff --cc sound/core/control.c
index f668826649b37668b0a4f28a2b023de886ab51df,38728b00f59c53523c3f3fd26e5838de104b684f..7d7d592a8428006f0a3ef73ef0f25b7b62c31788
--- 1/sound/core/control.c
--- 2/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/control_compat.c
Simple merge

diff --cc sound/core/control_led.c
Simple merge

diff --cc sound/core/seq/seq_ports.h
index 20a26bffecb78528a4e7e1d1f7e144d1c7bf24c7,9e36738c0dd049698d72abf31cbbb4b383f8b649..b3b35018cb8209684f15938f704dc7d891447457
--- 1/sound/core/seq/seq_ports.h
--- 2/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
  };
  

diff --cc sound/core/seq/seq_ump_convert.c
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge