lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 395/862] ALSA: hda/hdmi: change type for the assigned variable
    Date
    From: Jaroslav Kysela <perex@perex.cz>

    [ Upstream commit 4053a41282f8aae290d3fe7b8daef4c8c53a4ab8 ]

    This change converts the assigned value from int type to
    the bool type to retain consistency with other structure
    members like 'setup', 'non_pcm' etc.

    Signed-off-by: Jaroslav Kysela <perex@perex.cz>
    Link: https://lore.kernel.org/r/20220913070307.3234038-1-perex@perex.cz
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Stable-dep-of: fc6f923ecfa2 ("ALSA: hda/hdmi: Fix the converter allocation for the silent stream")
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/pci/hda/patch_hdmi.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
    index c239d9dbbaef..69afea67bf3e 100644
    --- a/sound/pci/hda/patch_hdmi.c
    +++ b/sound/pci/hda/patch_hdmi.c
    @@ -53,7 +53,7 @@ MODULE_PARM_DESC(enable_all_pins, "Forcibly enable all pins");

    struct hdmi_spec_per_cvt {
    hda_nid_t cvt_nid;
    - int assigned;
    + bool assigned; /* the stream has been assigned */
    unsigned int channels_min;
    unsigned int channels_max;
    u32 rates;
    @@ -1204,7 +1204,7 @@ static int hdmi_pcm_open_no_pin(struct hda_pcm_stream *hinfo,
    return err;

    per_cvt = get_cvt(spec, cvt_idx);
    - per_cvt->assigned = 1;
    + per_cvt->assigned = true;
    hinfo->nid = per_cvt->cvt_nid;

    pin_cvt_fixup(codec, NULL, per_cvt->cvt_nid);
    @@ -1273,7 +1273,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,

    per_cvt = get_cvt(spec, cvt_idx);
    /* Claim converter */
    - per_cvt->assigned = 1;
    + per_cvt->assigned = true;

    set_bit(pcm_idx, &spec->pcm_in_use);
    per_pin = get_pin(spec, pin_idx);
    @@ -1308,7 +1308,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
    snd_hdmi_eld_update_pcm_info(&eld->info, hinfo);
    if (hinfo->channels_min > hinfo->channels_max ||
    !hinfo->rates || !hinfo->formats) {
    - per_cvt->assigned = 0;
    + per_cvt->assigned = false;
    hinfo->nid = 0;
    snd_hda_spdif_ctls_unassign(codec, pcm_idx);
    err = -ENODEV;
    @@ -1767,7 +1767,7 @@ static void silent_stream_enable(struct hda_codec *codec,
    }

    per_cvt = get_cvt(spec, cvt_idx);
    - per_cvt->assigned = 1;
    + per_cvt->assigned = true;
    per_pin->cvt_nid = per_cvt->cvt_nid;
    per_pin->silent_stream = true;

    @@ -1827,7 +1827,7 @@ static void silent_stream_disable(struct hda_codec *codec,
    cvt_idx = cvt_nid_to_cvt_index(codec, per_pin->cvt_nid);
    if (cvt_idx >= 0 && cvt_idx < spec->num_cvts) {
    per_cvt = get_cvt(spec, cvt_idx);
    - per_cvt->assigned = 0;
    + per_cvt->assigned = false;
    }

    if (spec->silent_stream_type == SILENT_STREAM_I915) {
    @@ -2223,7 +2223,7 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
    goto unlock;
    }
    per_cvt = get_cvt(spec, cvt_idx);
    - per_cvt->assigned = 0;
    + per_cvt->assigned = false;
    hinfo->nid = 0;

    azx_stream(get_azx_dev(substream))->stripe = 0;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:09    [W:2.546 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site