From: Kuninori Morimoto Date: Thu, 9 Sep 2010 02:48:01 +0000 (+0900) Subject: fbdev: sh_mobile_hdmi: modify flags name to more specific X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dec6aa49abf73b061b631163cb1e1d803a614d24;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Signed-off-by: Kuninori Morimoto Reviewed-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown --- diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c index 0acd850f73b..beb04ef5fd0 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 929c2d3147b..1e1aa54ab2e 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;