p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ALSA: x86: Drop had_get_hwstate() 

The helper function isn't clearer than the plain condition check
"if (drv_status == HDA_DRV_DISCONNECTED)".  By expanding this, the
compiler could even catch the possible uninitialized cases, so we
could fix them, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2017-01-31 16:46:44 +01:00
parent caa2a61a70
commit 79f439ea40
1 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sound/x86/intel_hdmi_audio.c
View File

@ -155,15 +155,6 @@ static const struct snd_pcm_hardware snd_intel_hadstream = {
}; };
/* Register access functions */ /* Register access functions */
static int had_get_hwstate(struct snd_intelhad *intelhaddata)
{
/* Check for device presence -SW state */
if (intelhaddata->drv_status == HAD_DRV_DISCONNECTED)
return -ENODEV;
return 0;
}
static inline void static inline void
mid_hdmi_audio_read(struct snd_intelhad *ctx, u32 reg, u32 *val) mid_hdmi_audio_read(struct snd_intelhad *ctx, u32 reg, u32 *val)
{ {
@ -179,11 +170,8 @@ mid_hdmi_audio_write(struct snd_intelhad *ctx, u32 reg, u32 val)
static int had_read_register(struct snd_intelhad *intelhaddata, static int had_read_register(struct snd_intelhad *intelhaddata,
u32 offset, u32 *data) u32 offset, u32 *data)
{ {
int retval; if (intelhaddata->drv_status == HAD_DRV_DISCONNECTED)
return -ENODEV;
retval = had_get_hwstate(intelhaddata);
if (retval)
return retval;
mid_hdmi_audio_read(intelhaddata, offset, data); mid_hdmi_audio_read(intelhaddata, offset, data);
return 0; return 0;
@ -201,11 +189,8 @@ static void fixup_dp_config(struct snd_intelhad *intelhaddata,
static int had_write_register(struct snd_intelhad *intelhaddata, static int had_write_register(struct snd_intelhad *intelhaddata,
u32 offset, u32 data) u32 offset, u32 data)
{ {
int retval; if (intelhaddata->drv_status == HAD_DRV_DISCONNECTED)
return -ENODEV;
retval = had_get_hwstate(intelhaddata);
if (retval)
return retval;
fixup_dp_config(intelhaddata, offset, &data); fixup_dp_config(intelhaddata, offset, &data);
mid_hdmi_audio_write(intelhaddata, offset, data); mid_hdmi_audio_write(intelhaddata, offset, data);
@ -216,11 +201,9 @@ static int had_read_modify(struct snd_intelhad *intelhaddata, u32 offset,
u32 data, u32 mask) u32 data, u32 mask)
{ {
u32 val_tmp; u32 val_tmp;
int retval;
retval = had_get_hwstate(intelhaddata); if (intelhaddata->drv_status == HAD_DRV_DISCONNECTED)
if (retval) return -ENODEV;
return retval;
mid_hdmi_audio_read(intelhaddata, offset, &val_tmp); mid_hdmi_audio_read(intelhaddata, offset, &val_tmp);
val_tmp &= ~mask; val_tmp &= ~mask;
@ -930,7 +913,7 @@ static int snd_intelhad_prog_n(u32 aud_samp_freq, u32 *n_param,
static void snd_intelhad_handle_underrun(struct snd_intelhad *intelhaddata) static void snd_intelhad_handle_underrun(struct snd_intelhad *intelhaddata)
{ {
u32 hdmi_status, i = 0; u32 hdmi_status = 0, i = 0;
/* Handle Underrun interrupt within Audio Unit */ /* Handle Underrun interrupt within Audio Unit */
had_write_register(intelhaddata, AUD_CONFIG, 0); had_write_register(intelhaddata, AUD_CONFIG, 0);
@ -977,7 +960,7 @@ static int snd_intelhad_open(struct snd_pcm_substream *substream)
pm_runtime_get(intelhaddata->dev); pm_runtime_get(intelhaddata->dev);
if (had_get_hwstate(intelhaddata)) { if (intelhaddata->drv_status == HAD_DRV_DISCONNECTED) {
dev_dbg(intelhaddata->dev, "%s: HDMI cable plugged-out\n", dev_dbg(intelhaddata->dev, "%s: HDMI cable plugged-out\n",
__func__); __func__);
retval = -ENODEV; retval = -ENODEV;
@ -1185,7 +1168,7 @@ static int snd_intelhad_pcm_trigger(struct snd_pcm_substream *substream,
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
/* Disable local INTRs till register prgmng is done */ /* Disable local INTRs till register prgmng is done */
if (had_get_hwstate(intelhaddata)) { if (intelhaddata->drv_status == HAD_DRV_DISCONNECTED) {
dev_dbg(intelhaddata->dev, dev_dbg(intelhaddata->dev,
"_START: HDMI cable plugged-out\n"); "_START: HDMI cable plugged-out\n");
retval = -ENODEV; retval = -ENODEV;
@ -1245,7 +1228,7 @@ static int snd_intelhad_pcm_prepare(struct snd_pcm_substream *substream)
runtime = substream->runtime; runtime = substream->runtime;
had_stream = &intelhaddata->stream_data; had_stream = &intelhaddata->stream_data;
if (had_get_hwstate(intelhaddata)) { if (intelhaddata->drv_status == HAD_DRV_DISCONNECTED) {
dev_dbg(intelhaddata->dev, "%s: HDMI cable plugged-out\n", dev_dbg(intelhaddata->dev, "%s: HDMI cable plugged-out\n",
__func__); __func__);
retval = -ENODEV; retval = -ENODEV;
@ -1329,6 +1312,9 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
intelhaddata = snd_pcm_substream_chip(substream); intelhaddata = snd_pcm_substream_chip(substream);
if (intelhaddata->drv_status == HAD_DRV_DISCONNECTED)
return SNDRV_PCM_POS_XRUN;
if (intelhaddata->flag_underrun) { if (intelhaddata->flag_underrun) {
intelhaddata->flag_underrun = false; intelhaddata->flag_underrun = false;
return SNDRV_PCM_POS_XRUN; return SNDRV_PCM_POS_XRUN;
@ -1614,7 +1600,7 @@ static int had_process_buffer_done(struct snd_intelhad *intelhaddata)
spin_unlock_irqrestore(&intelhaddata->had_spinlock, flag_irqs); spin_unlock_irqrestore(&intelhaddata->had_spinlock, flag_irqs);
if (had_get_hwstate(intelhaddata)) { if (intelhaddata->drv_status == HAD_DRV_DISCONNECTED) {
dev_dbg(intelhaddata->dev, "HDMI cable plugged-out\n"); dev_dbg(intelhaddata->dev, "HDMI cable plugged-out\n");
return 0; return 0;
} }