9
0
Fork 0

driver: Introduce dev_request_mem_resource

dev_request_mem_region returns a void * which shall be checked with
IS_ERR(), but in some cases the valid pointer returned clashes with
error values. This is especially the case on some Atmel SoCs.

This introduces dev_request_mem_resource which returns a struct resource
instead which in any case can be checked with IS_ERR(). It's the drivers
responsibility then to get the IOMEM pointer from the resource.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2016-02-18 11:01:59 +01:00
parent 8ee5479a28
commit fe7855bb4f
2 changed files with 15 additions and 2 deletions

View File

@ -404,7 +404,7 @@ void __iomem *dev_request_mem_region_err_null(struct device_d *dev, int num)
}
EXPORT_SYMBOL(dev_request_mem_region_err_null);
void __iomem *dev_request_mem_region(struct device_d *dev, int num)
struct resource *dev_request_mem_resource(struct device_d *dev, int num)
{
struct resource *res;
@ -412,7 +412,14 @@ void __iomem *dev_request_mem_region(struct device_d *dev, int num)
if (IS_ERR(res))
return ERR_CAST(res);
res = request_iomem_region(dev_name(dev), res->start, res->end);
return request_iomem_region(dev_name(dev), res->start, res->end);
}
void __iomem *dev_request_mem_region(struct device_d *dev, int num)
{
struct resource *res;
res = dev_request_mem_resource(dev, num);
if (IS_ERR(res))
return ERR_CAST(res);

View File

@ -203,9 +203,15 @@ void *dev_get_mem_region(struct device_d *dev, int num);
/*
* exlusively request register base 'num' for a device
* deprecated, use dev_request_mem_resource instead
*/
void __iomem *dev_request_mem_region(struct device_d *dev, int num);
/*
* exlusively request resource 'num' for a device
*/
struct resource *dev_request_mem_resource(struct device_d *dev, int num);
/*
* exlusively request register base 'num' for a device
* will return NULL on error