summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2010-09-09 02:48:01 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-10 15:07:41 (GMT)
commitdec6aa49abf73b061b631163cb1e1d803a614d24 (patch)
tree6e4e8010c0ad0bb1eb005364e76fb1bf475cc753
parentf4363b7d88e99497e4241397efee09b106d802c4 (diff)
downloadlinux-dec6aa49abf73b061b631163cb1e1d803a614d24.tar.xz
fbdev: sh_mobile_hdmi: modify flags name to more specific
This patch solve below report from Guennadi 1) > +/* Audio source select */ > +#define HDMI_SRC_MASK (0xF << 0) > +#define HDMI_SRC_I2S (0 << 0) /* default */ > +#define HDMI_SRC_SPDIF (1 << 0) > +#define HDMI_SRC_DSD (2 << 0) > +#define HDMI_SRC_HBR (3 << 0) I would be more specific with these macro names, i.e., include "AUDIO" or "SND" or something similar in them, e.g., HDMI_AUDIO_SRC_I2S. 2) > + case HDMI_SRC_I2S: > + data = (0x0 << 3); > + break; > + case HDMI_SRC_SPDIF: > + data = (0x1 << 3); > + break; > + case HDMI_SRC_DSD: > + data = (0x2 << 3); > + break; > + case HDMI_SRC_HBR: > + data = (0x3 << 3); In all above cases parenthesis are superfluous. Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/video/sh_mobile_hdmi.c18
-rw-r--r--include/video/sh_mobile_hdmi.h10
2 files changed, 14 insertions, 14 deletions
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
index 0acd850..beb04ef 100644
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@ -389,20 +389,20 @@ static void sh_hdmi_audio_config(struct sh_hdmi *hdmi)
* [6:5] set required down sampling rate if required
* [4:3] set required audio source
*/
- switch (pdata->flags & HDMI_SRC_MASK) {
+ switch (pdata->flags & HDMI_SND_SRC_MASK) {
default:
/* fall through */
- case HDMI_SRC_I2S:
- data = (0x0 << 3);
+ case HDMI_SND_SRC_I2S:
+ data = 0x0 << 3;
break;
- case HDMI_SRC_SPDIF:
- data = (0x1 << 3);
+ case HDMI_SND_SRC_SPDIF:
+ data = 0x1 << 3;
break;
- case HDMI_SRC_DSD:
- data = (0x2 << 3);
+ case HDMI_SND_SRC_DSD:
+ data = 0x2 << 3;
break;
- case HDMI_SRC_HBR:
- data = (0x3 << 3);
+ case HDMI_SND_SRC_HBR:
+ data = 0x3 << 3;
break;
}
hdmi_write(hdmi, data, HDMI_AUDIO_SETTING_1);
diff --git a/include/video/sh_mobile_hdmi.h b/include/video/sh_mobile_hdmi.h
index 929c2d3..1e1aa54 100644
--- a/include/video/sh_mobile_hdmi.h
+++ b/include/video/sh_mobile_hdmi.h
@@ -23,11 +23,11 @@ struct device;
*/
/* Audio source select */
-#define HDMI_SRC_MASK (0xF << 0)
-#define HDMI_SRC_I2S (0 << 0) /* default */
-#define HDMI_SRC_SPDIF (1 << 0)
-#define HDMI_SRC_DSD (2 << 0)
-#define HDMI_SRC_HBR (3 << 0)
+#define HDMI_SND_SRC_MASK (0xF << 0)
+#define HDMI_SND_SRC_I2S (0 << 0) /* default */
+#define HDMI_SND_SRC_SPDIF (1 << 0)
+#define HDMI_SND_SRC_DSD (2 << 0)
+#define HDMI_SND_SRC_HBR (3 << 0)
struct sh_mobile_hdmi_info {
struct sh_mobile_lcdc_chan_cfg *lcd_chan;