kernel: bump 5.10 to 5.10.103
[openwrt/openwrt.git] / target / linux / at91 / patches-5.10 / 238-clk-at91-clk-master-improve-readability-by-using-loc.patch
1 From 17b53ad1574cb5f41789993289d3d94f7a50f0ce Mon Sep 17 00:00:00 2001
2 From: Claudiu Beznea <claudiu.beznea@microchip.com>
3 Date: Mon, 11 Oct 2021 14:27:09 +0300
4 Subject: [PATCH 238/247] clk: at91: clk-master: improve readability by using
5 local variables
6
7 Improve readability in clk_sama7g5_master_set() by using local
8 variables.
9
10 Suggested-by: Nicolas Ferre <nicolas.ferre@microchip.com>
11 Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
12 Link: https://lore.kernel.org/r/20211011112719.3951784-6-claudiu.beznea@microchip.com
13 Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
14 Signed-off-by: Stephen Boyd <sboyd@kernel.org>
15 ---
16 drivers/clk/at91/clk-master.c | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-)
18
19 --- a/drivers/clk/at91/clk-master.c
20 +++ b/drivers/clk/at91/clk-master.c
21 @@ -680,6 +680,8 @@ static void clk_sama7g5_master_set(struc
22 unsigned long flags;
23 unsigned int val, cparent;
24 unsigned int enable = status ? AT91_PMC_MCR_V2_EN : 0;
25 + unsigned int parent = master->parent << PMC_MCR_CSS_SHIFT;
26 + unsigned int div = master->div << MASTER_DIV_SHIFT;
27
28 spin_lock_irqsave(master->lock, flags);
29
30 @@ -689,9 +691,7 @@ static void clk_sama7g5_master_set(struc
31 regmap_update_bits(master->regmap, AT91_PMC_MCR_V2,
32 enable | AT91_PMC_MCR_V2_CSS | AT91_PMC_MCR_V2_DIV |
33 AT91_PMC_MCR_V2_CMD | AT91_PMC_MCR_V2_ID_MSK,
34 - enable | (master->parent << PMC_MCR_CSS_SHIFT) |
35 - (master->div << MASTER_DIV_SHIFT) |
36 - AT91_PMC_MCR_V2_CMD |
37 + enable | parent | div | AT91_PMC_MCR_V2_CMD |
38 AT91_PMC_MCR_V2_ID(master->id));
39
40 cparent = (val & AT91_PMC_MCR_V2_CSS) >> PMC_MCR_CSS_SHIFT;