[v2,02/13] pinctrl: intel: Reduce scope of the lock

Message ID	20200612145006.9145-2-andriy.shevchenko@linux.intel.com
State	New
Headers	show Return-Path: <linux-gpio-owner@vger.kernel.org> IronPort-SDR: pv3oOct4pXmWPz27U46zwiuShpCLtYWezxOojdBs66WRdEthAvs40EBUhUy2fnF7Oza/Ug8ZAU WXRrJhHeM09g== IronPort-SDR: pOsHACIWV6tU46O07CCTBgDvG9Rve6Z7w2W+Okreoi6tkj43ug1tvsgZ0F8Qx9ydekLZdpdC4i h2IBhz8fXYlg== From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: Linus Walleij <linus.walleij@linaro.org>, linux-gpio@vger.kernel.org, Mika Westerberg <mika.westerberg@linux.intel.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Subject: [PATCH v2 02/13] pinctrl: intel: Reduce scope of the lock Date: Fri, 12 Jun 2020 17:49:55 +0300 Message-Id: <20200612145006.9145-2-andriy.shevchenko@linux.intel.com> In-Reply-To: <20200612145006.9145-1-andriy.shevchenko@linux.intel.com> References: <20200612145006.9145-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk
Series	[v2,01/13] pinctrl: intel: Disable input and output buffer when switching to GPIO \| expand [v2,01/13] pinctrl: intel: Disable input and output buffer when switching to GPIO [v2,02/13] pinctrl: intel: Reduce scope of the lock [v2,03/13] pinctrl: intel: Make use of IRQ_RETVAL() [v2,04/13] pinctrl: intel: Get rid of redundant 'else' in intel_config_set_debounce() [v2,05/13] pinctrl: intel: Drop the only label in the code for consistency [v2,06/13] pinctrl: intel: Split intel_config_get() to three functions [v2,07/13] pinctrl: intel: Protect IO in few call backs by lock [v2,08/13] pinctrl: intel: Introduce for_each_requested_gpio() macro [v2,09/13] pinctrl: intel: Make use of for_each_requested_gpio() [v2,10/13] pinctrl: lynxpoint: Make use of for_each_requested_gpio() [v2,11/13] pinctrl: lynxpoint: Introduce helpers to enable or disable input [v2,12/13] pinctrl: lynxpoint: Drop no-op ACPI_PTR() call [v2,13/13] pinctrl: baytrail: Drop no-op ACPI_PTR() call

Message ID

20200612145006.9145-2-andriy.shevchenko@linux.intel.com

State

New

Headers

IronPort-SDR: 
 pv3oOct4pXmWPz27U46zwiuShpCLtYWezxOojdBs66WRdEthAvs40EBUhUy2fnF7Oza/Ug8ZAU
 WXRrJhHeM09g==
IronPort-SDR: 
 pOsHACIWV6tU46O07CCTBgDvG9Rve6Z7w2W+Okreoi6tkj43ug1tvsgZ0F8Qx9ydekLZdpdC4i
 h2IBhz8fXYlg==
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Linus Walleij <linus.walleij@linaro.org>,
        linux-gpio@vger.kernel.org,
        Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 02/13] pinctrl: intel: Reduce scope of the lock
Date: Fri, 12 Jun 2020 17:49:55 +0300
Message-Id: <20200612145006.9145-2-andriy.shevchenko@linux.intel.com>
In-Reply-To: <20200612145006.9145-1-andriy.shevchenko@linux.intel.com>
References: <20200612145006.9145-1-andriy.shevchenko@linux.intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-gpio-owner@vger.kernel.org
Precedence: bulk

Series

[v2,01/13] pinctrl: intel: Disable input and output buffer when switching to GPIO | expand

Commit Message

Andy Shevchenko June 12, 2020, 2:49 p.m. UTC

In some cases lock covers unneeded calls and operations.
Reduce scope of the lock in such cases.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/pinctrl/intel/pinctrl-intel.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 9df5a0c0d416..d0b658ba2136 100644
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -460,6 +460,8 @@  static int intel_gpio_request_enable(struct pinctrl_dev *pctldev,
 	void __iomem *padcfg0;
 	unsigned long flags;
 
+	padcfg0 = intel_get_padcfg(pctrl, pin, PADCFG0);
+
 	raw_spin_lock_irqsave(&pctrl->lock, flags);
 
 	if (!intel_pad_owned_by_host(pctrl, pin)) {
@@ -472,8 +474,6 @@  static int intel_gpio_request_enable(struct pinctrl_dev *pctldev,
 		return 0;
 	}
 
-	padcfg0 = intel_get_padcfg(pctrl, pin, PADCFG0);
-
 	/*
 	 * If pin is already configured in GPIO mode, we assume that
 	 * firmware provides correct settings. In such case we avoid
@@ -503,11 +503,10 @@  static int intel_gpio_set_direction(struct pinctrl_dev *pctldev,
 	void __iomem *padcfg0;
 	unsigned long flags;
 
-	raw_spin_lock_irqsave(&pctrl->lock, flags);
-
 	padcfg0 = intel_get_padcfg(pctrl, pin, PADCFG0);
-	__intel_gpio_set_direction(padcfg0, input);
 
+	raw_spin_lock_irqsave(&pctrl->lock, flags);
+	__intel_gpio_set_direction(padcfg0, input);
 	raw_spin_unlock_irqrestore(&pctrl->lock, flags);
 
 	return 0;
@@ -622,10 +621,11 @@  static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin,
 	int ret = 0;
 	u32 value;
 
-	raw_spin_lock_irqsave(&pctrl->lock, flags);
-
 	community = intel_get_community(pctrl, pin);
 	padcfg1 = intel_get_padcfg(pctrl, pin, PADCFG1);
+
+	raw_spin_lock_irqsave(&pctrl->lock, flags);
+
 	value = readl(padcfg1);
 
 	switch (param) {

[v2,02/13] pinctrl: intel: Reduce scope of the lock

Commit Message

Patch