2020-08-25 05:03:02

by Joe Perches

Subject: [PATCH 09/29] drm/gma500: Avoid comma separated statements

Use semicolons and braces.

Signed-off-by: Joe Perches <[email protected]>
---
drivers/gpu/drm/gma500/mdfld_intel_display.c | 44 +++++++++++++-------
1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c
index aae2d358364c..bfa330df9443 100644
--- a/drivers/gpu/drm/gma500/mdfld_intel_display.c
+++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c
@@ -824,33 +824,45 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
if ((ksel == KSEL_CRYSTAL_19) || (ksel == KSEL_BYPASS_19)) {
refclk = 19200;

- if (is_mipi || is_mipi2)
- clk_n = 1, clk_p2 = 8;
- else if (is_hdmi)
- clk_n = 1, clk_p2 = 10;
+ if (is_mipi || is_mipi2) {
+ clk_n = 1;
+ clk_p2 = 8;
+ } else if (is_hdmi) {
+ clk_n = 1;
+ clk_p2 = 10;
+ }
} else if (ksel == KSEL_BYPASS_25) {
refclk = 25000;

- if (is_mipi || is_mipi2)
- clk_n = 1, clk_p2 = 8;
- else if (is_hdmi)
- clk_n = 1, clk_p2 = 10;
+ if (is_mipi || is_mipi2) {
+ clk_n = 1;
+ clk_p2 = 8;
+ } else if (is_hdmi) {
+ clk_n = 1;
+ clk_p2 = 10;
+ }
} else if ((ksel == KSEL_BYPASS_83_100) &&
dev_priv->core_freq == 166) {
refclk = 83000;

- if (is_mipi || is_mipi2)
- clk_n = 4, clk_p2 = 8;
- else if (is_hdmi)
- clk_n = 4, clk_p2 = 10;
+ if (is_mipi || is_mipi2) {
+ clk_n = 4;
+ clk_p2 = 8;
+ } else if (is_hdmi) {
+ clk_n = 4;
+ clk_p2 = 10;
+ }
} else if ((ksel == KSEL_BYPASS_83_100) &&
(dev_priv->core_freq == 100 ||
dev_priv->core_freq == 200)) {
refclk = 100000;
- if (is_mipi || is_mipi2)
- clk_n = 4, clk_p2 = 8;
- else if (is_hdmi)
- clk_n = 4, clk_p2 = 10;
+ if (is_mipi || is_mipi2) {
+ clk_n = 4;
+ clk_p2 = 8;
+ } else if (is_hdmi) {
+ clk_n = 4;
+ clk_p2 = 10;
+ }
}

if (is_mipi)
--
2.26.0

2021-01-30 18:52:29

by Joe Perches

Subject: Re: [PATCH 09/29] drm/gma500: Avoid comma separated statements

On Mon, 2020-08-24 at 21:56 -0700, Joe Perches wrote:
> Use semicolons and braces.

Ping?

> Signed-off-by: Joe Perches <[email protected]>
> ---
> ?drivers/gpu/drm/gma500/mdfld_intel_display.c | 44 +++++++++++++-------
> ?1 file changed, 28 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c
> index aae2d358364c..bfa330df9443 100644
> --- a/drivers/gpu/drm/gma500/mdfld_intel_display.c
> +++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c
> @@ -824,33 +824,45 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
> ? if ((ksel == KSEL_CRYSTAL_19) || (ksel == KSEL_BYPASS_19)) {
> ? refclk = 19200;
> ?
>
> - if (is_mipi || is_mipi2)
> - clk_n = 1, clk_p2 = 8;
> - else if (is_hdmi)
> - clk_n = 1, clk_p2 = 10;
> + if (is_mipi || is_mipi2) {
> + clk_n = 1;
> + clk_p2 = 8;
> + } else if (is_hdmi) {
> + clk_n = 1;
> + clk_p2 = 10;
> + }
> ? } else if (ksel == KSEL_BYPASS_25) {
> ? refclk = 25000;
> ?
>
> - if (is_mipi || is_mipi2)
> - clk_n = 1, clk_p2 = 8;
> - else if (is_hdmi)
> - clk_n = 1, clk_p2 = 10;
> + if (is_mipi || is_mipi2) {
> + clk_n = 1;
> + clk_p2 = 8;
> + } else if (is_hdmi) {
> + clk_n = 1;
> + clk_p2 = 10;
> + }
> ? } else if ((ksel == KSEL_BYPASS_83_100) &&
> ? dev_priv->core_freq == 166) {
> ? refclk = 83000;
> ?
>
> - if (is_mipi || is_mipi2)
> - clk_n = 4, clk_p2 = 8;
> - else if (is_hdmi)
> - clk_n = 4, clk_p2 = 10;
> + if (is_mipi || is_mipi2) {
> + clk_n = 4;
> + clk_p2 = 8;
> + } else if (is_hdmi) {
> + clk_n = 4;
> + clk_p2 = 10;
> + }
> ? } else if ((ksel == KSEL_BYPASS_83_100) &&
> ? (dev_priv->core_freq == 100 ||
> ? dev_priv->core_freq == 200)) {
> ? refclk = 100000;
> - if (is_mipi || is_mipi2)
> - clk_n = 4, clk_p2 = 8;
> - else if (is_hdmi)
> - clk_n = 4, clk_p2 = 10;
> + if (is_mipi || is_mipi2) {
> + clk_n = 4;
> + clk_p2 = 8;
> + } else if (is_hdmi) {
> + clk_n = 4;
> + clk_p2 = 10;
> + }
> ? }
> ?
>
> ? if (is_mipi)

2021-01-30 21:26:43

by Patrik Jakobsson

Subject: Re: [PATCH 09/29] drm/gma500: Avoid comma separated statements

On Sat, Jan 30, 2021 at 7:47 PM Joe Perches <[email protected]> wrote:
>
> On Mon, 2020-08-24 at 21:56 -0700, Joe Perches wrote:
> > Use semicolons and braces.
>
> Ping?

This entire file is going away so perhaps just drop the patch to avoid
a conflict.

-Patrik

>
> > Signed-off-by: Joe Perches <[email protected]>
> > ---
> > drivers/gpu/drm/gma500/mdfld_intel_display.c | 44 +++++++++++++-------
> > 1 file changed, 28 insertions(+), 16 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c
> > index aae2d358364c..bfa330df9443 100644
> > --- a/drivers/gpu/drm/gma500/mdfld_intel_display.c
> > +++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c
> > @@ -824,33 +824,45 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
> > if ((ksel == KSEL_CRYSTAL_19) || (ksel == KSEL_BYPASS_19)) {
> > refclk = 19200;
> >
> >
> > - if (is_mipi || is_mipi2)
> > - clk_n = 1, clk_p2 = 8;
> > - else if (is_hdmi)
> > - clk_n = 1, clk_p2 = 10;
> > + if (is_mipi || is_mipi2) {
> > + clk_n = 1;
> > + clk_p2 = 8;
> > + } else if (is_hdmi) {
> > + clk_n = 1;
> > + clk_p2 = 10;
> > + }
> > } else if (ksel == KSEL_BYPASS_25) {
> > refclk = 25000;
> >
> >
> > - if (is_mipi || is_mipi2)
> > - clk_n = 1, clk_p2 = 8;
> > - else if (is_hdmi)
> > - clk_n = 1, clk_p2 = 10;
> > + if (is_mipi || is_mipi2) {
> > + clk_n = 1;
> > + clk_p2 = 8;
> > + } else if (is_hdmi) {
> > + clk_n = 1;
> > + clk_p2 = 10;
> > + }
> > } else if ((ksel == KSEL_BYPASS_83_100) &&
> > dev_priv->core_freq == 166) {
> > refclk = 83000;
> >
> >
> > - if (is_mipi || is_mipi2)
> > - clk_n = 4, clk_p2 = 8;
> > - else if (is_hdmi)
> > - clk_n = 4, clk_p2 = 10;
> > + if (is_mipi || is_mipi2) {
> > + clk_n = 4;
> > + clk_p2 = 8;
> > + } else if (is_hdmi) {
> > + clk_n = 4;
> > + clk_p2 = 10;
> > + }
> > } else if ((ksel == KSEL_BYPASS_83_100) &&
> > (dev_priv->core_freq == 100 ||
> > dev_priv->core_freq == 200)) {
> > refclk = 100000;
> > - if (is_mipi || is_mipi2)
> > - clk_n = 4, clk_p2 = 8;
> > - else if (is_hdmi)
> > - clk_n = 4, clk_p2 = 10;
> > + if (is_mipi || is_mipi2) {
> > + clk_n = 4;
> > + clk_p2 = 8;
> > + } else if (is_hdmi) {
> > + clk_n = 4;
> > + clk_p2 = 10;
> > + }
> > }
> >
> >
> > if (is_mipi)
>
>