From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-gpio@vger.kernel.org
Cc: linus.walleij@linaro.org, narmstrong@baylibre.com,
linux-kernel@vger.kernel.org, cphealy@gmail.com,
Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 09/14] pinctrl-sx150x: Remove excessive locking
Date: Tue, 1 Nov 2016 08:57:43 -0700 [thread overview]
Message-ID: <1478015868-10309-10-git-send-email-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <1478015868-10309-1-git-send-email-andrew.smirnov@gmail.com>
Gpiochip and irqchip aspects of this driver do not access any shared
registers on the chip itself and atomicity of various regmap operations
is ensured by that API's implementation, so there doesn't seem to be a
reason to hold the lock in as many places as it is held now.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/pinctrl/pinctrl-sx150x.c | 70 +++++++++-------------------------------
1 file changed, 16 insertions(+), 54 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c
index af0fc07..8d0fd4b 100644
--- a/drivers/pinctrl/pinctrl-sx150x.c
+++ b/drivers/pinctrl/pinctrl-sx150x.c
@@ -342,13 +342,9 @@ static int sx150x_gpio_set_single_ended(struct gpio_chip *chip,
sx150x_pin_is_oscio(pctl, offset))
return 0;
- mutex_lock(&pctl->lock);
ret = regmap_write_bits(pctl->regmap,
pctl->data->pri.x789.reg_drain,
BIT(offset), 0);
- mutex_unlock(&pctl->lock);
- if (ret < 0)
- return ret;
break;
case LINE_MODE_OPEN_DRAIN:
@@ -356,20 +352,16 @@ static int sx150x_gpio_set_single_ended(struct gpio_chip *chip,
sx150x_pin_is_oscio(pctl, offset))
return -ENOTSUPP;
- mutex_lock(&pctl->lock);
ret = regmap_write_bits(pctl->regmap,
pctl->data->pri.x789.reg_drain,
BIT(offset), BIT(offset));
- mutex_unlock(&pctl->lock);
- if (ret < 0)
- return ret;
break;
-
default:
- return -ENOTSUPP;
+ ret = -ENOTSUPP;
+ break;
}
- return 0;
+ return ret;
}
static int __sx150x_gpio_set(struct sx150x_pinctrl *pctl, unsigned int offset,
@@ -384,57 +376,46 @@ static void sx150x_gpio_set(struct gpio_chip *chip, unsigned int offset,
{
struct sx150x_pinctrl *pctl = gpiochip_get_data(chip);
- if (sx150x_pin_is_oscio(pctl, offset)) {
- mutex_lock(&pctl->lock);
+ if (sx150x_pin_is_oscio(pctl, offset))
regmap_write(pctl->regmap,
pctl->data->pri.x789.reg_clock,
(value ? 0x1f : 0x10));
- mutex_unlock(&pctl->lock);
- } else {
- mutex_lock(&pctl->lock);
+ else
__sx150x_gpio_set(pctl, offset, value);
- mutex_unlock(&pctl->lock);
- }
+
}
static int sx150x_gpio_direction_input(struct gpio_chip *chip,
unsigned int offset)
{
struct sx150x_pinctrl *pctl = gpiochip_get_data(chip);
- int ret;
if (sx150x_pin_is_oscio(pctl, offset))
return -EINVAL;
- mutex_lock(&pctl->lock);
- ret = regmap_write_bits(pctl->regmap,
- pctl->data->reg_dir,
- BIT(offset), BIT(offset));
- mutex_unlock(&pctl->lock);
-
- return ret;
+ return regmap_write_bits(pctl->regmap,
+ pctl->data->reg_dir,
+ BIT(offset), BIT(offset));
}
static int sx150x_gpio_direction_output(struct gpio_chip *chip,
unsigned int offset, int value)
{
struct sx150x_pinctrl *pctl = gpiochip_get_data(chip);
- int status;
+ int ret;
if (sx150x_pin_is_oscio(pctl, offset)) {
sx150x_gpio_set(chip, offset, value);
return 0;
}
- mutex_lock(&pctl->lock);
- status = __sx150x_gpio_set(pctl, offset, value);
- if (status >= 0)
- status = regmap_write_bits(pctl->regmap,
- pctl->data->reg_dir,
- BIT(offset), 0);
- mutex_unlock(&pctl->lock);
+ ret = __sx150x_gpio_set(pctl, offset, value);
+ if (ret < 0)
+ return ret;
- return status;
+ return regmap_write_bits(pctl->regmap,
+ pctl->data->reg_dir,
+ BIT(offset), 0);
}
static void sx150x_irq_mask(struct irq_data *d)
@@ -535,12 +516,9 @@ static int sx150x_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,
switch (param) {
case PIN_CONFIG_DRIVE_PUSH_PULL:
case PIN_CONFIG_OUTPUT:
- mutex_lock(&pctl->lock);
ret = regmap_read(pctl->regmap,
pctl->data->pri.x789.reg_clock,
&data);
- mutex_unlock(&pctl->lock);
-
if (ret < 0)
return ret;
@@ -565,12 +543,10 @@ static int sx150x_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,
switch (param) {
case PIN_CONFIG_BIAS_PULL_DOWN:
- mutex_lock(&pctl->lock);
ret = regmap_read(pctl->regmap,
pctl->data->reg_pulldn,
&data);
data &= BIT(pin);
- mutex_unlock(&pctl->lock);
if (ret < 0)
return ret;
@@ -582,12 +558,10 @@ static int sx150x_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,
break;
case PIN_CONFIG_BIAS_PULL_UP:
- mutex_lock(&pctl->lock);
ret = regmap_read(pctl->regmap,
pctl->data->reg_pullup,
&data);
data &= BIT(pin);
- mutex_unlock(&pctl->lock);
if (ret < 0)
return ret;
@@ -602,12 +576,10 @@ static int sx150x_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,
if (pctl->data->model != SX150X_789)
return -ENOTSUPP;
- mutex_lock(&pctl->lock);
ret = regmap_read(pctl->regmap,
pctl->data->pri.x789.reg_drain,
&data);
data &= BIT(pin);
- mutex_unlock(&pctl->lock);
if (ret < 0)
return ret;
@@ -622,12 +594,10 @@ static int sx150x_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,
if (pctl->data->model != SX150X_789)
arg = true;
else {
- mutex_lock(&pctl->lock);
ret = regmap_read(pctl->regmap,
pctl->data->pri.x789.reg_drain,
&data);
data &= BIT(pin);
- mutex_unlock(&pctl->lock);
if (ret < 0)
return ret;
@@ -692,41 +662,33 @@ static int sx150x_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
switch (param) {
case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT:
case PIN_CONFIG_BIAS_DISABLE:
- mutex_lock(&pctl->lock);
ret = regmap_write_bits(pctl->regmap,
pctl->data->reg_pulldn,
BIT(pin), 0);
- mutex_unlock(&pctl->lock);
if (ret < 0)
return ret;
- mutex_lock(&pctl->lock);
ret = regmap_write_bits(pctl->regmap,
pctl->data->reg_pullup,
BIT(pin), 0);
- mutex_unlock(&pctl->lock);
if (ret < 0)
return ret;
break;
case PIN_CONFIG_BIAS_PULL_UP:
- mutex_lock(&pctl->lock);
ret = regmap_write_bits(pctl->regmap,
pctl->data->reg_pullup,
BIT(pin), BIT(pin));
- mutex_unlock(&pctl->lock);
if (ret < 0)
return ret;
break;
case PIN_CONFIG_BIAS_PULL_DOWN:
- mutex_lock(&pctl->lock);
ret = regmap_write_bits(pctl->regmap,
pctl->data->reg_pulldn,
BIT(pin), BIT(pin));
- mutex_unlock(&pctl->lock);
if (ret < 0)
return ret;
--
2.5.5
next prev parent reply other threads:[~2016-11-01 15:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-01 15:57 [PATCH 00/14] pinctrl-sx150x: Various bug-fixes and code simplifications Andrey Smirnov
2016-11-01 15:57 ` [PATCH 01/14] pinctrl-sx150x: Rely on of_modalias_node for OF matching Andrey Smirnov
2016-11-04 12:28 ` Linus Walleij
2016-11-04 20:09 ` Andrey Smirnov
2016-11-04 21:29 ` Linus Walleij
2016-11-01 15:57 ` [PATCH 02/14] pinctrl-sx150x: Add SX1503 specific data Andrey Smirnov
2016-11-01 15:57 ` [PATCH 03/14] pinctrl-sx150x: Replace magic number in sx150x_init_hw Andrey Smirnov
2016-11-01 15:57 ` [PATCH 04/14] pinctrl-sx150x: Fix incorrect constant " Andrey Smirnov
2016-11-01 15:57 ` [PATCH 05/14] pinctrl-sx150x: Move some code out of sx150x_init_hw Andrey Smirnov
2016-11-01 15:57 ` [PATCH 06/14] pinctrl-sx150x: Improve sx150x_init_misc for SX1504/5/6 Andrey Smirnov
2016-11-01 15:57 ` [PATCH 07/14] pinctrl-sx150x: Convert driver to use regmap API Andrey Smirnov
2016-11-01 15:57 ` [PATCH 08/14] pinctrl-sx150x: Replace sx150x_*_cfg by means of " Andrey Smirnov
2016-11-01 15:57 ` Andrey Smirnov [this message]
2016-11-01 15:57 ` [PATCH 10/14] pinctrl-sx150x: Improve oscio GPIO functions Andrey Smirnov
2016-11-01 15:57 ` [PATCH 11/14] pinctrl-sx150x: Simplify interrupt handler Andrey Smirnov
2016-11-01 15:57 ` [PATCH 12/14] pinctrl-sx150x: Use handle_bad_irq instead of handle_edge_irq Andrey Smirnov
2016-11-01 15:57 ` [PATCH 13/14] pinctrl-sx150x: Remove magic numbers from sx150x_irq_set_type Andrey Smirnov
2016-11-01 15:57 ` [PATCH 14/14] pinctrl-sx150x: Remove magic numbers from sx150x_reset Andrey Smirnov
2016-11-02 11:01 ` [PATCH 00/14] pinctrl-sx150x: Various bug-fixes and code simplifications Neil Armstrong
2016-11-02 13:33 ` Neil Armstrong
2016-11-03 22:22 ` Andrey Smirnov
2016-11-04 12:17 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1478015868-10309-10-git-send-email-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=cphealy@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=narmstrong@baylibre.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®