Skip to content

Commit

Permalink
ALSA: hda/hdmi: change type for the 'assigned' variable
Browse files Browse the repository at this point in the history
[ Upstream commit 4053a41 ]

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: fc6f923 ("ALSA: hda/hdmi: Fix the converter allocation for the silent stream")
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
perexg authored and gregkh committed Oct 21, 2022
1 parent 518f05f commit 639ea30
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions sound/pci/hda/patch_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 639ea30

Please sign in to comment.