mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Tarun Kanti DebBarma <tarun.kanti@ti.com>
To: <linux-omap@vger.kernel.org>
Cc: <grant.likely@secretlab.ca>, <khilman@ti.com>, <tony@atomide.com>,
	<linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	Tarun Kanti DebBarma <tarun.kanti@ti.com>
Subject: [PATCH 1/6] gpio/omap: remove saved_fallingdetect, saved_risingdetect fields
Date: Thu, 23 Feb 2012 17:40:26 +0530	[thread overview]
Message-ID: <1329999031-6914-2-git-send-email-tarun.kanti@ti.com> (raw)
In-Reply-To: <1329999031-6914-1-git-send-email-tarun.kanti@ti.com>

Since we already have context.fallingdetect and context.risingdetect
there is no more need to have these additional fields. Also, getting
rid of extra reads associated with them.

Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
---
 drivers/gpio/gpio-omap.c |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index f29252f..40a1fb2 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -59,8 +59,6 @@ struct gpio_bank {
 	u32 enabled_non_wakeup_gpios;
 	struct gpio_regs context;
 	u32 saved_datain;
-	u32 saved_fallingdetect;
-	u32 saved_risingdetect;
 	u32 level_mask;
 	u32 toggle_mask;
 	spinlock_t lock;
@@ -1224,11 +1222,9 @@ static int omap_gpio_runtime_suspend(struct device *dev)
 
 	bank->saved_datain = __raw_readl(bank->base +
 						bank->regs->datain);
-	l1 = __raw_readl(bank->base + bank->regs->fallingdetect);
-	l2 = __raw_readl(bank->base + bank->regs->risingdetect);
+	l1 = bank->context.fallingdetect;
+	l2 = bank->context.risingdetect;
 
-	bank->saved_fallingdetect = l1;
-	bank->saved_risingdetect = l2;
 	l1 &= ~bank->enabled_non_wakeup_gpios;
 	l2 &= ~bank->enabled_non_wakeup_gpios;
 
@@ -1287,9 +1283,9 @@ static int omap_gpio_runtime_resume(struct device *dev)
 		}
 	}
 
-	__raw_writel(bank->saved_fallingdetect,
+	__raw_writel(bank->context.fallingdetect,
 			bank->base + bank->regs->fallingdetect);
-	__raw_writel(bank->saved_risingdetect,
+	__raw_writel(bank->context.risingdetect,
 			bank->base + bank->regs->risingdetect);
 	l = __raw_readl(bank->base + bank->regs->datain);
 
@@ -1306,14 +1302,15 @@ static int omap_gpio_runtime_resume(struct device *dev)
 	 * No need to generate IRQs for the rising edge for gpio IRQs
 	 * configured with falling edge only; and vice versa.
 	 */
-	gen0 = l & bank->saved_fallingdetect;
+	gen0 = l & bank->context.fallingdetect;
 	gen0 &= bank->saved_datain;
 
-	gen1 = l & bank->saved_risingdetect;
+	gen1 = l & bank->context.risingdetect;
 	gen1 &= ~(bank->saved_datain);
 
 	/* FIXME: Consider GPIO IRQs with level detections properly! */
-	gen = l & (~(bank->saved_fallingdetect) & ~(bank->saved_risingdetect));
+	gen = l & (~(bank->context.fallingdetect) &
+					 ~(bank->context.risingdetect));
 	/* Consider all GPIO IRQs needed to be updated */
 	gen |= gen0 | gen1;
 
-- 
1.7.0.4


  reply	other threads:[~2012-02-23 12:11 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-23 12:10 [PATCH 0/6] gpio/omap: Some more driver cleanup and fixes Tarun Kanti DebBarma
2012-02-23 12:10 ` Tarun Kanti DebBarma [this message]
2012-02-23 12:28   ` [PATCH 1/6] gpio/omap: remove saved_fallingdetect, saved_risingdetect fields Felipe Balbi
2012-02-23 12:10 ` [PATCH 2/6] gpio/omap: remove saved_wakeup field from struct gpio_bank Tarun Kanti DebBarma
2012-02-23 12:28   ` Felipe Balbi
2012-02-27 23:50   ` Kevin Hilman
2012-02-28  5:08     ` DebBarma, Tarun Kanti
2012-02-23 12:10 ` [PATCH 3/6] gpio/omap: remove suspend_wakeup " Tarun Kanti DebBarma
2012-02-23 12:29   ` Felipe Balbi
2012-02-27 23:54   ` Kevin Hilman
2012-02-28  9:39     ` DebBarma, Tarun Kanti
2012-02-28 11:15       ` DebBarma, Tarun Kanti
2012-02-28 18:45       ` Kevin Hilman
2012-02-29  4:18         ` DebBarma, Tarun Kanti
2012-02-23 12:10 ` [PATCH 4/6] gpio/omap: get rid of retrigger variable in gpio_irq_handler Tarun Kanti DebBarma
2012-02-23 12:30   ` Felipe Balbi
2012-02-28  0:02   ` Kevin Hilman
2012-02-28  5:11     ` DebBarma, Tarun Kanti
2012-02-23 12:10 ` [PATCH 5/6] gpio/omap: fix trigger type to unsigned Tarun Kanti DebBarma
2012-02-23 12:30   ` Felipe Balbi
2012-02-23 12:39   ` Shubhrajyoti
2012-02-23 12:46     ` Russell King - ARM Linux
2012-02-23 12:10 ` [PATCH 6/6] gpio/omap: fix _set_gpio_irqenable implementation Tarun Kanti DebBarma
2012-02-23 12:31   ` Felipe Balbi
2012-02-28  0:11   ` Kevin Hilman
2012-02-23 12:26 ` [PATCH 0/6] gpio/omap: Some more driver cleanup and fixes Shilimkar, Santosh
2012-03-12 17:34   ` Grant Likely
2012-03-12 18:42     ` Kevin Hilman
2012-03-12 18:43       ` Grant Likely

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=1329999031-6914-2-git-send-email-tarun.kanti@ti.com \
    --to=tarun.kanti@ti.com \
    --cc=grant.likely@secretlab.ca \
    --cc=khilman@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.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

all inboxes | Powered by JetHome®