Skip to contentSkip to conversation

clk: imx: clk-pllv3: mark expected switch fall-throughs

PATCH Applied Gustavo A. R. Silva 3 participants 6 messages Apr 30, 2019 – May 3, 2019

Subsystems (3)
Arm i.MX and Layerscape Common clk NXP i.MX clock drivers
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 clk: imx: clk-pllv3: mark expected switch fall-throughs

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warnings:

drivers/clk/imx/clk-pllv3.c: In function ‘imx_clk_pllv3’:
drivers/clk/imx/clk-pllv3.c:446:18: warning: this statement may fall through [-Wimplicit-fallthrough=]
pll->div_shift = 1;
~~~~~~~~~~~~~~~^~~
drivers/clk/imx/clk-pllv3.c:447:2: note: here
case IMX_PLLV3_USB:
^~~~
drivers/clk/imx/clk-pllv3.c:453:21: warning: this statement may fall through [-Wimplicit-fallthrough=]

   pll->denom_offset = PLL_IMX7_DENOM_OFFSET;
                     ^

drivers/clk/imx/clk-pllv3.c:454:2: note: here
case IMX_PLLV3_AV:
^~~~

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/clk/imx/clk-pllv3.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/clk/imx/clk-pllv3.c +2 -0
index e892b9a836e5..4110e713d259 100644
@@ -444,6 +444,7 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,
 		break;
 	case IMX_PLLV3_USB_VF610:
 		pll->div_shift = 1;
+		/* fall through */
 	case IMX_PLLV3_USB:
 		ops = &clk_pllv3_ops;
 		pll->powerup_set = true;

@@ -451,6 +452,7 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,
 	case IMX_PLLV3_AV_IMX7:
 		pll->num_offset = PLL_IMX7_NUM_OFFSET;
 		pll->denom_offset = PLL_IMX7_DENOM_OFFSET;
+		/* fall through */
 	case IMX_PLLV3_AV:
 		ops = &clk_pllv3_av_ops;
 		break;
Signature · 1 line
2.21.0
maintainer
#1 lore raw

Quoting Gustavo A. R. Silva (2019-04-30 07:32:06)

Quoted 19 lines

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warnings:

drivers/clk/imx/clk-pllv3.c: In function ‘imx_clk_pllv3’:
drivers/clk/imx/clk-pllv3.c:446:18: warning: this statement may fall through [-Wimplicit-fallthrough=]

   pll->div_shift = 1;
   ~~~~~~~~~~~~~~~^~~

drivers/clk/imx/clk-pllv3.c:447:2: note: here
case IMX_PLLV3_USB:
^~~~
drivers/clk/imx/clk-pllv3.c:453:21: warning: this statement may fall through [-Wimplicit-fallthrough=]

   pll->denom_offset = PLL_IMX7_DENOM_OFFSET;
                     ^

drivers/clk/imx/clk-pllv3.c:454:2: note: here
case IMX_PLLV3_AV:
^~~~

Quoted 6 lines

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

Signed-off-by Gustavo A. R. Silva <[email protected]>

It was sent by Anson already.

author
#2 lore raw
Quoted 20 lines · Stephen Boyd

Quoting Gustavo A. R. Silva (2019-04-30 07:32:06)

Quoted 19 lines

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warnings:

drivers/clk/imx/clk-pllv3.c: In function ‘imx_clk_pllv3’:
drivers/clk/imx/clk-pllv3.c:446:18: warning: this statement may fall through [-Wimplicit-fallthrough=]

   pll->div_shift = 1;
   ~~~~~~~~~~~~~~~^~~

drivers/clk/imx/clk-pllv3.c:447:2: note: here
case IMX_PLLV3_USB:
^~~~
drivers/clk/imx/clk-pllv3.c:453:21: warning: this statement may fall through [-Wimplicit-fallthrough=]

   pll->denom_offset = PLL_IMX7_DENOM_OFFSET;
                     ^

drivers/clk/imx/clk-pllv3.c:454:2: note: here
case IMX_PLLV3_AV:
^~~~

Quoted 9 lines
Quoted 6 lines

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

Signed-off-by Gustavo A. R. Silva <[email protected]>

It was sent by Anson already.

Did he address both warnings?

Thanks
--
Gustavo

maintainer
#3 lore raw

Quoting Gustavo A. R. Silva (2019-04-30 10:28:32)

Quoted 28 lines · Stephen Boyd
Quoted 25 lines

Quoting Gustavo A. R. Silva (2019-04-30 07:32:06)

Quoted 24 lines

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warnings:

drivers/clk/imx/clk-pllv3.c: In function ‘imx_clk_pllv3’:
drivers/clk/imx/clk-pllv3.c:446:18: warning: this statement may fall through [-Wimplicit-fallthrough=]

   pll->div_shift = 1;
   ~~~~~~~~~~~~~~~^~~

drivers/clk/imx/clk-pllv3.c:447:2: note: here
case IMX_PLLV3_USB:
^~~~
drivers/clk/imx/clk-pllv3.c:453:21: warning: this statement may fall through [-Wimplicit-fallthrough=]

   pll->denom_offset = PLL_IMX7_DENOM_OFFSET;
                     ^

drivers/clk/imx/clk-pllv3.c:454:2: note: here
case IMX_PLLV3_AV:
^~~~

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Gustavo A. R. Silva <[email protected]>

It was sent by Anson already.

Did he address both warnings?

No. I added you to the thread.

Reviewed-by on v1 1/1
#4 lore raw
In reply to Gustavo A. R. Silva
Quoted 58 lines

-----Original Message-----
From: Gustavo A. R. Silva [mailto:[email protected]]
Sent: Tuesday, April 30, 2019 10:32 PM
To: Michael Turquette <[email protected]>; Stephen Boyd <[email protected]>; Shawn Guo <[email protected]>; Sascha Hauer <[email protected]>; Pengutronix Kernel Team <[email protected]>; Fabio Estevam <[email protected]>; dl-linux- imx <[email protected]>
Cc: [email protected]; [email protected]; linux- [email protected]; Gustavo A. R. Silva <[email protected]>
Subject: [PATCH] clk: imx: clk-pllv3: mark expected switch fall-throughs

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warnings:

drivers/clk/imx/clk-pllv3.c: In function ‘imx_clk_pllv3’:
drivers/clk/imx/clk-pllv3.c:446:18: warning: this statement may fall through [- Wimplicit-fallthrough=]

   pll->div_shift = 1;
   ~~~~~~~~~~~~~~~^~~

drivers/clk/imx/clk-pllv3.c:447:2: note: here
case IMX_PLLV3_USB:
^~~~
drivers/clk/imx/clk-pllv3.c:453:21: warning: this statement may fall through [- Wimplicit-fallthrough=]

   pll->denom_offset = PLL_IMX7_DENOM_OFFSET;
                     ^

drivers/clk/imx/clk-pllv3.c:454:2: note: here
case IMX_PLLV3_AV:
^~~~

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/clk/imx/clk-pllv3.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/clk/imx/clk-pllv3.c index renamed from drivers/clk/imx/clk-pllv3.c +0 -0

e892b9a836e5..4110e713d259 100644

drivers/clk/imx/clk-pllv3.c +1 -0
@@ -444,6 +444,7 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type,
 const char *name,
 		break;
 	case IMX_PLLV3_USB_VF610:
 		pll->div_shift = 1;
+		/* fall through */
 	case IMX_PLLV3_USB:
 		ops = &clk_pllv3_ops;
drivers/clk/imx/clk-pllv3.c +0 -0
 		pll->powerup_set = true;

drivers/clk/imx/clk-pllv3.c struct clk *imx_clk_pllv3(enum imx_pllv3_type type, · line 456

Quoted 5 lines
drivers/clk/imx/clk-pllv3.c +1 -0
@@ -451,6 +452,7 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type,
 const char *name,
 	case IMX_PLLV3_AV_IMX7:
 		pll->num_offset = PLL_IMX7_NUM_OFFSET;
 		pll->denom_offset = PLL_IMX7_DENOM_OFFSET;
+		/* fall through */
Reviewed-by Anson Huang <[email protected]>
Quoted 5 lines
drivers/clk/imx/clk-pllv3.c +0 -0
 	case IMX_PLLV3_AV:
 		ops = &clk_pllv3_av_ops;

break;
--
2.21.0

maintainer Applied
#5 lore raw
In reply to Gustavo A. R. Silva

Quoting Gustavo A. R. Silva (2019-04-30 07:32:06)

Quoted 19 lines

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warnings:

drivers/clk/imx/clk-pllv3.c: In function ‘imx_clk_pllv3’:
drivers/clk/imx/clk-pllv3.c:446:18: warning: this statement may fall through [-Wimplicit-fallthrough=]

   pll->div_shift = 1;
   ~~~~~~~~~~~~~~~^~~

drivers/clk/imx/clk-pllv3.c:447:2: note: here
case IMX_PLLV3_USB:
^~~~
drivers/clk/imx/clk-pllv3.c:453:21: warning: this statement may fall through [-Wimplicit-fallthrough=]

   pll->denom_offset = PLL_IMX7_DENOM_OFFSET;
                     ^

drivers/clk/imx/clk-pllv3.c:454:2: note: here
case IMX_PLLV3_AV:
^~~~

Quoted 7 lines

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

Signed-off-by Gustavo A. R. Silva <[email protected]>

---

Applied to clk-next