evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpio-langwell: do not use direct access to iomapped memory

Browse source 
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>
Acked-by: David Cohen <david.a.cohen@intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Andy Shevchenko 2013-05-22 13:20:11 +03:00 • committed by Linus Walleij
parent aeb168f77c
commit 64c8cbc17c
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/gpio/gpio-langwell.c
View file

@ -65,7 +65,7 @@ enum GPIO_REG {
struct lnw_gpio { struct lnw_gpio {
struct gpio_chip chip; struct gpio_chip chip;
void *reg_base; void __iomem *reg_base;
spinlock_t lock; spinlock_t lock;
struct pci_dev *pdev; struct pci_dev *pdev;
struct irq_domain *domain; struct irq_domain *domain;
@ -320,7 +320,7 @@ static const struct dev_pm_ops lnw_gpio_pm_ops = {
static int lnw_gpio_probe(struct pci_dev *pdev, 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; resource_size_t start, len;
struct lnw_gpio *lnw; struct lnw_gpio *lnw;
u32 gpio_base; u32 gpio_base;
@ -346,8 +346,10 @@ static int lnw_gpio_probe(struct pci_dev *pdev,
retval = -EFAULT; retval = -EFAULT;
goto err_ioremap; 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 */ /* release the IO mapping, since we already get the info from bar1 */
iounmap(base); iounmap(base);
/* get the register base from bar0 */ /* get the register base from bar0 */