summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2019-04-28 20:19:06 +0300
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>2019-04-28 20:19:06 +0300
commit5f61d9517f17069dbedb94aa71034f0a22e014ef (patch)
tree334d787e018512a3b6111d44ae248b4be97558f0 /drivers/pinctrl
parenta0a5f7661e1c49de0c1f93ca435ba2880b88fc5c (diff)
downloadlinux-5f61d9517f17069dbedb94aa71034f0a22e014ef.tar.bz2
pinctrl: intel: Increase readability of intel_gpio_update_pad_mode()
We better to use usual pattern for read-modify-update, than doing some operations in definition block. No functional change. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/intel/pinctrl-intel.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 1c85cc807a8f..d7acbb79cdf7 100644
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -1555,10 +1555,12 @@ intel_gpio_is_requested(struct gpio_chip *chip, int base, unsigned int size)
static u32
intel_gpio_update_pad_mode(void __iomem *hostown, u32 mask, u32 value)
{
- u32 curr = readl(hostown);
- u32 updated = (curr & ~mask) | (value & mask);
+ u32 curr, updated;
+ curr = readl(hostown);
+ updated = (curr & ~mask) | (value & mask);
writel(updated, hostown);
+
return curr;
}