From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Linus Walleij <linus.walleij@linaro.org>,
David Cohen <david.a.cohen@intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v3 2/5] gpio-langwell: do not use direct access to iomapped memory
Date: Wed, 22 May 2013 13:20:11 +0300 [thread overview]
Message-ID: <1369218014-28990-3-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1369218014-28990-1-git-send-email-andriy.shevchenko@linux.intel.com>
We better to use readl() function instead of bad looking direct access.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/gpio/gpio-langwell.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/gpio/gpio-langwell.c b/drivers/gpio/gpio-langwell.c
index c1f33dd..8203084 100644
--- a/drivers/gpio/gpio-langwell.c
+++ b/drivers/gpio/gpio-langwell.c
@@ -65,7 +65,7 @@ enum GPIO_REG {
struct lnw_gpio {
struct gpio_chip chip;
- void *reg_base;
+ void __iomem *reg_base;
spinlock_t lock;
struct pci_dev *pdev;
struct irq_domain *domain;
@@ -318,9 +318,9 @@ static const struct dev_pm_ops lnw_gpio_pm_ops = {
};
static int lnw_gpio_probe(struct pci_dev *pdev,
- const struct pci_device_id *id)
+ const struct pci_device_id *id)
{
- void *base;
+ void __iomem *base;
resource_size_t start, len;
struct lnw_gpio *lnw;
u32 gpio_base;
@@ -346,8 +346,10 @@ static int lnw_gpio_probe(struct pci_dev *pdev,
retval = -EFAULT;
goto err_ioremap;
}
- irq_base = *(u32 *)base;
- gpio_base = *((u32 *)base + 1);
+
+ irq_base = readl(base);
+ gpio_base = readl(sizeof(u32) + base);
+
/* release the IO mapping, since we already get the info from bar1 */
iounmap(base);
/* get the register base from bar0 */
--
1.8.2.rc0.22.gb3600c3
next prev parent reply other threads:[~2013-05-22 10:20 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-22 10:20 [PATCH v3 0/5] gpio-langwell: bugfix and amendments Andy Shevchenko
2013-05-22 10:20 ` [PATCH v3 1/5] gpio-langwell: initialize lock before usage Andy Shevchenko
2013-05-30 17:20 ` Linus Walleij
2013-05-31 12:01 ` Linus Walleij
2013-05-31 14:03 ` Andy Shevchenko
2013-05-22 10:20 ` Andy Shevchenko [this message]
2013-05-30 17:21 ` [PATCH v3 2/5] gpio-langwell: do not use direct access to iomapped memory Linus Walleij
2013-05-22 10:20 ` [PATCH v3 3/5] gpio-langwell: use managed functions pcim_* and devm_* Andy Shevchenko
2013-05-22 11:06 ` Mika Westerberg
2013-05-30 17:25 ` Linus Walleij
2013-05-31 7:57 ` Andy Shevchenko
2013-05-22 10:20 ` [PATCH v3 4/5] gpio-langwell: amend error messages Andy Shevchenko
2013-05-30 17:27 ` Linus Walleij
2013-05-22 10:20 ` [PATCH v3 5/5] gpio-langwell: drop away explicit casting Andy Shevchenko
2013-05-22 11:07 ` Mika Westerberg
2013-05-30 17:28 ` Linus Walleij
2013-05-22 16:28 ` [PATCH v3 0/5] gpio-langwell: bugfix and amendments David Cohen
2013-05-28 8:05 ` Andy Shevchenko
2013-05-30 17:30 ` 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=1369218014-28990-3-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=david.a.cohen@intel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.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