]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ALSA: hdac: Remove the usage of key for host stream
authorJeeja KP <jeeja.kp@intel.com>
Fri, 21 Aug 2015 16:06:21 +0000 (21:36 +0530)
committerTakashi Iwai <tiwai@suse.de>
Fri, 21 Aug 2015 17:28:21 +0000 (19:28 +0200)
hdac_ext_stream assign doesn't require key mapping as in case of
hdac_stream. So for host stream, the key to device mapping needs
to be removed.

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/hda/ext/hdac_ext_stream.c

index a4f6bbe5da8f03a8d486d563e6b628e2f604a4e9..c978a9bb1db836576d58ac3f7410c93b023003dc 100644 (file)
@@ -291,17 +291,12 @@ hdac_ext_host_stream_assign(struct hdac_ext_bus *ebus,
        struct hdac_ext_stream *res = NULL;
        struct hdac_stream *stream = NULL;
        struct hdac_bus *hbus = &ebus->bus;
-       int key;
 
        if (!ebus->ppcap) {
                dev_err(hbus->dev, "stream type not supported\n");
                return NULL;
        }
 
-       /* make a non-zero unique key for the substream */
-       key = (substream->pcm->device << 16) | (substream->number << 2) |
-                       (substream->stream + 1);
-
        list_for_each_entry(stream, &hbus->stream_list, list) {
                struct hdac_ext_stream *hstream = container_of(stream,
                                                struct hdac_ext_stream,
@@ -320,7 +315,6 @@ hdac_ext_host_stream_assign(struct hdac_ext_bus *ebus,
                spin_lock_irq(&hbus->reg_lock);
                res->hstream.opened = 1;
                res->hstream.running = 0;
-               res->hstream.assigned_key = key;
                res->hstream.substream = substream;
                spin_unlock_irq(&hbus->reg_lock);
        }