Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 13:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

basic_mmio_gpio: request register regions

Browse Source 
Make sure that we get the register regions with request_mem_region()
before ioremap() to make sure we have exclusive access.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Jamie Iles 2011-05-20 00:40:16 -06:00 committed by Grant Likely
parent 924e7a9fc6
commit 364b5e8718
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpio/basic_mmio_gpio.c
View File

@ -192,6 +192,16 @@ static int bgpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
return 0; return 0;
} }
static void __iomem *bgpio_request_and_map(struct device *dev,
struct resource *res)
{
if (!devm_request_mem_region(dev, res->start, resource_size(res),
res->name ?: "mmio_gpio"))
return NULL;
return devm_ioremap(dev, res->start, resource_size(res));
}
static int bgpio_setup_accessors(struct platform_device *pdev, static int bgpio_setup_accessors(struct platform_device *pdev,
struct bgpio_chip *bgc) struct bgpio_chip *bgc)
{ {
@ -258,7 +268,7 @@ static int __devinit bgpio_probe(struct platform_device *pdev)
if (!bgc) if (!bgc)
return -ENOMEM; return -ENOMEM;
bgc->reg_dat = devm_ioremap(dev, res_dat->start, dat_sz); bgc->reg_dat = bgpio_request_and_map(dev, res_dat);
if (!bgc->reg_dat) if (!bgc->reg_dat)
return -ENOMEM; return -ENOMEM;
@ -269,8 +279,8 @@ static int __devinit bgpio_probe(struct platform_device *pdev)
resource_size(res_set) != dat_sz) resource_size(res_set) != dat_sz)
return -EINVAL; return -EINVAL;
bgc->reg_set = devm_ioremap(dev, res_set->start, dat_sz); bgc->reg_set = bgpio_request_and_map(dev, res_set);
bgc->reg_clr = devm_ioremap(dev, res_clr->start, dat_sz); bgc->reg_clr = bgpio_request_and_map(dev, res_clr);
if (!bgc->reg_set || !bgc->reg_clr) if (!bgc->reg_set || !bgc->reg_clr)
return -ENOMEM; return -ENOMEM;
} else if (res_set || res_clr) { } else if (res_set || res_clr) {