diff mbox series

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

Message ID 20190430143206.GA4035@embeddedor (mailing list archive)
State Accepted, archived
Headers show
Series clk: imx: clk-pllv3: mark expected switch fall-throughs | expand

Commit Message

Gustavo A. R. Silva April 30, 2019, 2:32 p.m. UTC
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 <gustavo@embeddedor.com>
---
 drivers/clk/imx/clk-pllv3.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Stephen Boyd April 30, 2019, 5:22 p.m. UTC | #1
Quoting Gustavo A. R. Silva (2019-04-30 07:32:06)
> 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 <gustavo@embeddedor.com>

It was sent by Anson already.
Gustavo A. R. Silva April 30, 2019, 5:28 p.m. UTC | #2
On 4/30/19 12:22 PM, Stephen Boyd wrote:
> Quoting Gustavo A. R. Silva (2019-04-30 07:32:06)
>> 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 <gustavo@embeddedor.com>
> 
> It was sent by Anson already.
> 

Did he address both warnings?

Thanks
--
Gustavo
Stephen Boyd April 30, 2019, 6:17 p.m. UTC | #3
Quoting Gustavo A. R. Silva (2019-04-30 10:28:32)
> 
> 
> On 4/30/19 12:22 PM, Stephen Boyd wrote:
> > Quoting Gustavo A. R. Silva (2019-04-30 07:32:06)
> >> 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 <gustavo@embeddedor.com>
> > 
> > It was sent by Anson already.
> > 
> 
> Did he address both warnings?
> 

No. I added you to the thread.
Anson Huang May 3, 2019, 12:58 p.m. UTC | #4
> -----Original Message-----
> From: Gustavo A. R. Silva [mailto:gustavo@embeddedor.com]
> Sent: Tuesday, April 30, 2019 10:32 PM
> To: Michael Turquette <mturquette@baylibre.com>; Stephen Boyd
> <sboyd@kernel.org>; Shawn Guo <shawnguo@kernel.org>; Sascha Hauer
> <s.hauer@pengutronix.de>; Pengutronix Kernel Team
> <kernel@pengutronix.de>; Fabio Estevam <festevam@gmail.com>; dl-linux-
> imx <linux-imx@nxp.com>
> Cc: linux-clk@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-
> kernel@vger.kernel.org; Gustavo A. R. Silva <gustavo@embeddedor.com>
> 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 <gustavo@embeddedor.com>
> ---
>  drivers/clk/imx/clk-pllv3.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c index
> e892b9a836e5..4110e713d259 100644
> --- a/drivers/clk/imx/clk-pllv3.c
> +++ b/drivers/clk/imx/clk-pllv3.c
> @@ -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 */


Reviewed-by: Anson Huang <Anson.Huang@nxp.com>

>  	case IMX_PLLV3_AV:
>  		ops = &clk_pllv3_av_ops;
>  		break;
> --
> 2.21.0
Stephen Boyd May 3, 2019, 4:03 p.m. UTC | #5
Quoting Gustavo A. R. Silva (2019-04-30 07:32:06)
> 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 <gustavo@embeddedor.com>
> ---

Applied to clk-next
diff mbox series

Patch

diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index e892b9a836e5..4110e713d259 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -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;