From: libin.yang@intel.com
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, libin.yang@intel.com, broonie@kernel.org,
pierre-louis.bossart@linux.intel.com
Subject: [RFC PATCH 4/4] ASoC: hdac_hdmi: fix some coding style issue
Date: Mon, 27 May 2019 17:07:27 +0800 [thread overview]
Message-ID: <1558948047-18930-5-git-send-email-libin.yang@intel.com> (raw)
In-Reply-To: <1558948047-18930-1-git-send-email-libin.yang@intel.com>
From: Libin Yang <libin.yang@intel.com>
This patch fixes some coding style issue
Signed-off-by: Libin Yang <libin.yang@intel.com>
---
sound/soc/codecs/hdac_hdmi.c | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index ed267fa..a52d236 100644
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -477,8 +477,8 @@ static int hdac_hdmi_query_port_connlist(struct hdac_device *hdev,
{
if (!(get_wcaps(hdev, pin->nid) & AC_WCAP_CONN_LIST)) {
dev_warn(&hdev->dev,
- "HDMI: pin %d wcaps %#x does not support connection list\n",
- pin->nid, get_wcaps(hdev, pin->nid));
+ "HDMI: pin %d wcaps %#x does not support connection list\n",
+ pin->nid, get_wcaps(hdev, pin->nid));
return -EINVAL;
}
@@ -489,11 +489,11 @@ static int hdac_hdmi_query_port_connlist(struct hdac_device *hdev,
port->mux_nids, HDA_MAX_CONNECTIONS);
if (port->num_mux_nids == 0)
dev_warn(&hdev->dev,
- "No connections found for pin:port %d:%d\n",
- pin->nid, port->id);
+ "No connections found for pin:port %d:%d\n",
+ pin->nid, port->id);
dev_dbg(&hdev->dev, "num_mux_nids %d for pin:port %d:%d\n",
- port->num_mux_nids, pin->nid, port->id);
+ port->num_mux_nids, pin->nid, port->id);
return port->num_mux_nids;
}
@@ -572,9 +572,9 @@ static int hdac_hdmi_pcm_open(struct snd_pcm_substream *substream,
(!port->eld.eld_valid)) {
dev_warn(&hdev->dev,
- "Failed: present?:%d ELD valid?:%d pin:port: %d:%d\n",
- port->eld.monitor_present, port->eld.eld_valid,
- port->pin->nid, port->id);
+ "Failed: present?:%d ELD valid?:%d pin:port: %d:%d\n",
+ port->eld.monitor_present, port->eld.eld_valid,
+ port->pin->nid, port->id);
return 0;
}
@@ -734,7 +734,7 @@ static int hdac_hdmi_pin_output_widget_event(struct snd_soc_dapm_widget *w,
struct hdac_hdmi_pcm *pcm;
dev_dbg(&hdev->dev, "%s: widget: %s event: %x\n",
- __func__, w->name, event);
+ __func__, w->name, event);
pcm = hdac_hdmi_get_pcm(hdev, port);
if (!pcm)
@@ -780,7 +780,7 @@ static int hdac_hdmi_cvt_output_widget_event(struct snd_soc_dapm_widget *w,
struct hdac_hdmi_pcm *pcm;
dev_dbg(&hdev->dev, "%s: widget: %s event: %x\n",
- __func__, w->name, event);
+ __func__, w->name, event);
pcm = hdac_hdmi_get_pcm_from_cvt(hdmi, cvt);
if (!pcm)
@@ -826,7 +826,7 @@ static int hdac_hdmi_pin_mux_widget_event(struct snd_soc_dapm_widget *w,
int mux_idx;
dev_dbg(&hdev->dev, "%s: widget: %s event: %x\n",
- __func__, w->name, event);
+ __func__, w->name, event);
if (!kc)
kc = w->kcontrols[0];
@@ -1142,7 +1142,7 @@ static int hdac_hdmi_init_dai_map(struct hdac_device *hdev)
if (dai_id == HDA_MAX_CVTS) {
dev_warn(&hdev->dev,
- "Max dais supported: %d\n", dai_id);
+ "Max dais supported: %d\n", dai_id);
break;
}
}
@@ -1242,8 +1242,8 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin,
pcm = hdac_hdmi_get_pcm(hdev, port);
if (!port->eld.monitor_present || !port->eld.eld_valid) {
- dev_err(&hdev->dev, "%s: disconnect for pin:port %d:%d\n",
- __func__, pin->nid, port->id);
+ dev_info(&hdev->dev, "%s: disconnect for pin:port %d:%d\n",
+ __func__, pin->nid, port->id);
hdac_hdmi_jack_report(port, false);
mutex_unlock(&hdmi->pin_mutex);
return;
@@ -1281,6 +1281,7 @@ static int hdac_hdmi_add_ports(struct hdac_device *hdev,
}
pin->ports = ports;
pin->num_ports = max_ports;
+
return 0;
}
@@ -1544,7 +1545,7 @@ static void hdac_hdmi_eld_notify_cb(void *aptr, int port, int pipe)
}
dev_dbg(&hdev->dev, "%s: for pin:%d port=%d\n", __func__,
- pin_nid, pipe);
+ pin_nid, pipe);
/*
* skip notification during system suspend (but not in runtime PM);
--
2.7.4
prev parent reply other threads:[~2019-05-27 9:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-27 9:07 [RFC PATCH 0/4] ASoC: hdac_hdmi: refine the hdac_hdmi jacks libin.yang
2019-05-27 9:07 ` [RFC PATCH 1/4] ASoC: hdac_hdmi: amixer kctl setting should not impact on jack status libin.yang
2019-05-27 9:07 ` [RFC PATCH 2/4] ASoC: hdac_hdmi: jack_event represents the status libin.yang
2019-05-27 9:07 ` [RFC PATCH 3/4] ASoC: hdac_hdmi: refine hdmi jacks libin.yang
2019-05-30 7:13 ` Takashi Iwai
2019-05-30 15:00 ` Yang, Libin
2019-05-30 15:22 ` Takashi Iwai
2019-05-31 2:27 ` Yang, Libin
2019-06-14 8:04 ` Yang, Libin
2019-06-25 6:02 ` Yang, Libin
2019-06-25 11:05 ` Takashi Iwai
2019-06-25 11:41 ` Hui Wang
2019-06-27 6:38 ` Takashi Iwai
2019-06-27 1:46 ` Yang, Libin
2019-05-27 9:07 ` libin.yang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1558948047-18930-5-git-send-email-libin.yang@intel.com \
--to=libin.yang@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.