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 diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
  20 index 88f7af1bfff6..9a2c8e64cacf 100644
  21 --- a/drivers/clk/at91/clk-master.c
  22 +++ b/drivers/clk/at91/clk-master.c
  23 @@ -680,6 +680,8 @@ static void clk_sama7g5_master_set(struct clk_master *master,
  24         unsigned long flags;
  25         unsigned int val, cparent;
  26         unsigned int enable = status ? AT91_PMC_MCR_V2_EN : 0;
  27 +       unsigned int parent = master->parent << PMC_MCR_CSS_SHIFT;
  28 +       unsigned int div = master->div << MASTER_DIV_SHIFT;
  29
  30         spin_lock_irqsave(master->lock, flags);
  31
  32 @@ -689,9 +691,7 @@ static void clk_sama7g5_master_set(struct clk_master *master,
  33         regmap_update_bits(master->regmap, AT91_PMC_MCR_V2,
  34                            enable | AT91_PMC_MCR_V2_CSS | AT91_PMC_MCR_V2_DIV |
  35                            AT91_PMC_MCR_V2_CMD | AT91_PMC_MCR_V2_ID_MSK,
  36 -                          enable | (master->parent << PMC_MCR_CSS_SHIFT) |
  37 -                          (master->div << MASTER_DIV_SHIFT) |
  38 -                          AT91_PMC_MCR_V2_CMD |
  39 +                          enable | parent | div | AT91_PMC_MCR_V2_CMD |
  40                            AT91_PMC_MCR_V2_ID(master->id));
  41
  42         cparent = (val & AT91_PMC_MCR_V2_CSS) >> PMC_MCR_CSS_SHIFT;
  43 --
  44 2.32.0
  45