gpio: timberdale: Switch to devm_ioremap_resource()
Replace calls to devm_request_mem_region and devm_ioremap with a direct call to devm_ioremap_resource instead and modify error handling. Move the call to platform_get_resource adjacent to the call to devm_ioremap_resource to make the connection between them more clear. A simplified version of the Coccinelle semantic patch that is used to make this change is as follows: //<smpl> @nm@ expression myname; identifier i; @@ struct platform_driver i = { .driver = { .name = myname } }; @@ expression dev,res,size,e1,e; expression nm.myname; @@ -if (!devm_request_mem_region(dev, res->start, size, - \(res->name\|dev_name(dev)\|myname\))) { - ... - return ...; -} ... when != res->start = e1 e = -devm_ioremap(dev,res->start,size); +devm_ioremap_resource(dev,res); if -(e == NULL) +(IS_ERR(e)) { ... -return ...; +return PTR_ERR(e); } //</smpl> Further, updated error handling by hand as devm_ioremap_resource gives appropriate error messages, so remove unnecessary error messages. Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Родитель
6dcfd7291b
Коммит
fa283db76f
|
@ -237,12 +237,6 @@ static int timbgpio_probe(struct platform_device *pdev)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!iomem) {
|
||||
dev_err(dev, "Unable to get resource\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
tgpio = devm_kzalloc(dev, sizeof(struct timbgpio), GFP_KERNEL);
|
||||
if (!tgpio) {
|
||||
dev_err(dev, "Memory alloc failed\n");
|
||||
|
@ -252,17 +246,10 @@ static int timbgpio_probe(struct platform_device *pdev)
|
|||
|
||||
spin_lock_init(&tgpio->lock);
|
||||
|
||||
if (!devm_request_mem_region(dev, iomem->start, resource_size(iomem),
|
||||
DRIVER_NAME)) {
|
||||
dev_err(dev, "Region already claimed\n");
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
tgpio->membase = devm_ioremap(dev, iomem->start, resource_size(iomem));
|
||||
if (!tgpio->membase) {
|
||||
dev_err(dev, "Cannot ioremap\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
tgpio->membase = devm_ioremap_resource(dev, iomem);
|
||||
if (IS_ERR(tgpio->membase))
|
||||
return PTR_ERR(tgpio->membase);
|
||||
|
||||
gc = &tgpio->gpio;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче