From: Grygorii Strashko <grygorii.strashko@ti.com>
To: Russell King <rmk@arm.linux.org.uk>,
Linus Walleij <linus.walleij@linaro.org>,
Tony Lindgren <tony@atomide.com>
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>,
<linux-omap@vger.kernel.org>, <linux-gpio@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Santosh Shilimkar <ssantosh@kernel.org>,
Russell King <rmk+kernel@armlinux.org.uk>,
Grygorii Strashko <grygorii.strashko@ti.com>
Subject: [PATCH-next 06/20] gpio: gpio-omap: move omap_gpio_request() and omap_gpio_free()
Date: Mon, 10 Jun 2019 20:10:49 +0300 [thread overview]
Message-ID: <20190610171103.30903-7-grygorii.strashko@ti.com> (raw)
In-Reply-To: <20190610171103.30903-1-grygorii.strashko@ti.com>
From: Russell King <rmk+kernel@armlinux.org.uk>
Move these two functions to live beside the rest of the gpio chip
implementation, rather than in the middle of the irq chip
implementation.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
drivers/gpio/gpio-omap.c | 64 ++++++++++++++++++++--------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 04e3da55e39c..cc320d09d074 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -689,38 +689,6 @@ static int omap_gpio_wake_enable(struct irq_data *d, unsigned int enable)
return irq_set_irq_wake(bank->irq, enable);
}
-static int omap_gpio_request(struct gpio_chip *chip, unsigned offset)
-{
- struct gpio_bank *bank = gpiochip_get_data(chip);
- unsigned long flags;
-
- pm_runtime_get_sync(chip->parent);
-
- raw_spin_lock_irqsave(&bank->lock, flags);
- omap_enable_gpio_module(bank, offset);
- bank->mod_usage |= BIT(offset);
- raw_spin_unlock_irqrestore(&bank->lock, flags);
-
- return 0;
-}
-
-static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)
-{
- struct gpio_bank *bank = gpiochip_get_data(chip);
- unsigned long flags;
-
- raw_spin_lock_irqsave(&bank->lock, flags);
- bank->mod_usage &= ~(BIT(offset));
- if (!LINE_USED(bank->irq_usage, offset)) {
- omap_set_gpio_direction(bank, offset, 1);
- omap_clear_gpio_debounce(bank, offset);
- }
- omap_disable_gpio_module(bank, offset);
- raw_spin_unlock_irqrestore(&bank->lock, flags);
-
- pm_runtime_put(chip->parent);
-}
-
/*
* We need to unmask the GPIO bank interrupt as soon as possible to
* avoid missing GPIO interrupts for other lines in the bank.
@@ -951,6 +919,38 @@ static inline void omap_mpuio_init(struct gpio_bank *bank)
/*---------------------------------------------------------------------*/
+static int omap_gpio_request(struct gpio_chip *chip, unsigned offset)
+{
+ struct gpio_bank *bank = gpiochip_get_data(chip);
+ unsigned long flags;
+
+ pm_runtime_get_sync(chip->parent);
+
+ raw_spin_lock_irqsave(&bank->lock, flags);
+ omap_enable_gpio_module(bank, offset);
+ bank->mod_usage |= BIT(offset);
+ raw_spin_unlock_irqrestore(&bank->lock, flags);
+
+ return 0;
+}
+
+static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)
+{
+ struct gpio_bank *bank = gpiochip_get_data(chip);
+ unsigned long flags;
+
+ raw_spin_lock_irqsave(&bank->lock, flags);
+ bank->mod_usage &= ~(BIT(offset));
+ if (!LINE_USED(bank->irq_usage, offset)) {
+ omap_set_gpio_direction(bank, offset, 1);
+ omap_clear_gpio_debounce(bank, offset);
+ }
+ omap_disable_gpio_module(bank, offset);
+ raw_spin_unlock_irqrestore(&bank->lock, flags);
+
+ pm_runtime_put(chip->parent);
+}
+
static int omap_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
{
struct gpio_bank *bank;
--
2.17.1
next prev parent reply other threads:[~2019-06-10 17:12 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 17:10 [PATCH-next 00/20] gpio: gpio-omap: set of fixes and big clean-up Grygorii Strashko
2019-06-10 17:10 ` [PATCH-next 01/20] gpio: gpio-omap: ensure irq is enabled before wakeup Grygorii Strashko
2019-06-12 7:54 ` Linus Walleij
2019-06-10 17:10 ` [PATCH-next 02/20] gpio: gpio-omap: fix lack of irqstatus_raw0 for OMAP4 Grygorii Strashko
2019-06-12 7:55 ` Linus Walleij
2019-06-10 17:10 ` [PATCH-next 03/20] gpio: gpio-omap: remove remainder of list management Grygorii Strashko
2019-06-12 7:56 ` Linus Walleij
2019-06-10 17:10 ` [PATCH-next 04/20] gpio: gpio-omap: clean up edge interrupt handling Grygorii Strashko
2019-06-12 7:57 ` Linus Walleij
2019-06-10 17:10 ` [PATCH-next 05/20] gpio: gpio-omap: remove irq_ack method Grygorii Strashko
2019-06-12 8:42 ` Linus Walleij
2019-06-10 17:10 ` Grygorii Strashko [this message]
2019-06-12 8:43 ` [PATCH-next 06/20] gpio: gpio-omap: move omap_gpio_request() and omap_gpio_free() Linus Walleij
2019-06-10 17:10 ` [PATCH-next 07/20] gpio: gpio-omap: simplify omap_gpio_get_direction() Grygorii Strashko
2019-06-12 8:47 ` Linus Walleij
2019-06-10 17:10 ` [PATCH-next 08/20] gpio: gpio-omap: simplify get() method Grygorii Strashko
2019-06-12 8:49 ` Linus Walleij
2019-06-10 17:10 ` [PATCH-next 09/20] gpio: gpio-omap: simplify get_multiple() Grygorii Strashko
2019-06-12 8:50 ` Linus Walleij
2019-06-10 17:10 ` [PATCH-next 10/20] gpio: gpio-omap: simplify set_multiple() Grygorii Strashko
2019-06-12 8:51 ` Linus Walleij
2019-06-10 17:10 ` [PATCH-next 11/20] gpio: gpio-omap: simplify bank->level_mask Grygorii Strashko
2019-06-10 17:10 ` [PATCH-next 12/20] gpio: gpio-omap: simplify read-modify-write Grygorii Strashko
2019-06-12 8:53 ` Linus Walleij
2019-06-10 17:10 ` [PATCH-next 13/20] gpio: gpio-omap: simplify omap_toggle_gpio_edge_triggering() Grygorii Strashko
2019-06-12 8:54 ` Linus Walleij
2019-06-10 17:10 ` [PATCH-next 14/20] gpio: gpio-omap: simplify omap_set_gpio_irqenable() Grygorii Strashko
2019-06-12 8:54 ` Linus Walleij
2019-06-10 17:10 ` [PATCH-next 15/20] gpio: gpio-omap: remove dataout variation in context handling Grygorii Strashko
2019-06-12 8:55 ` Linus Walleij
2019-06-10 17:10 ` [PATCH-next 16/20] gpio: gpio-omap: clean up omap_gpio_restore_context() Grygorii Strashko
2019-06-12 8:56 ` Linus Walleij
2019-06-10 17:11 ` [PATCH-next 17/20] gpio: gpio-omap: constify register tables Grygorii Strashko
2019-06-12 8:57 ` Linus Walleij
2019-06-10 17:11 ` [PATCH-next 18/20] gpio: gpio-omap: clean up wakeup handling Grygorii Strashko
2019-06-12 8:58 ` Linus Walleij
2019-06-10 17:11 ` [PATCH-next 19/20] gpio: gpio-omap: irq_startup() must not return error codes Grygorii Strashko
2019-06-12 8:59 ` Linus Walleij
2019-06-10 17:11 ` [PATCH-next 20/20] gpio: gpio-omap: clean up register access in omap2_set_gpio_debounce() Grygorii Strashko
2019-06-12 9:11 ` Linus Walleij
2019-06-17 18:57 ` grygorii
2019-06-18 11:28 ` Linus Walleij
2019-06-11 7:37 ` [PATCH-next 00/20] gpio: gpio-omap: set of fixes and big clean-up Tony Lindgren
2019-06-12 9:23 ` 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=20190610171103.30903-7-grygorii.strashko@ti.com \
--to=grygorii.strashko@ti.com \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=rmk@arm.linux.org.uk \
--cc=ssantosh@kernel.org \
--cc=tony@atomide.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;
as well as URLs for NNTP newsgroup(s).