sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

resource: Let dev_get_resource return an error pointer 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-07-31 08:47:48 +02:00
parent dde56d42ad
commit 9d518ba397
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/ata/intf_platform_ide.c
View File

@ -97,8 +97,8 @@ static int platform_ide_probe(struct device_d *dev)
alt_base = dev_request_mem_region(dev, 1);
} else {
reg = dev_get_resource(dev, IORESOURCE_IO, 0);
if (!reg)
return -ENODEV;
if (IS_ERR(reg))
return PTR_ERR(reg);
reg = request_ioport_region(dev_name(dev), reg->start,
reg->end);
@ -108,7 +108,7 @@ static int platform_ide_probe(struct device_d *dev)
reg_base = (void __force __iomem *) reg->start;
alt = dev_get_resource(dev, IORESOURCE_IO, 1);
if (alt) {
if (!IS_ERR(alt)) {
alt = request_ioport_region(dev_name(dev),
alt->start,
alt->end);

6
drivers/base/driver.c
View File

@ -256,7 +256,7 @@ struct resource *dev_get_resource(struct device_d *dev, unsigned long type,
}
}
return NULL;
return ERR_PTR(-ENOENT);
}
void *dev_get_mem_region(struct device_d *dev, int num)
@ -264,7 +264,7 @@ void *dev_get_mem_region(struct device_d *dev, int num)
struct resource *res;
res = dev_get_resource(dev, IORESOURCE_MEM, num);
if (!res)
if (IS_ERR(res))
return NULL;
return (void __force *)res->start;
@ -323,7 +323,7 @@ void __iomem *dev_request_mem_region(struct device_d *dev, int num)
struct resource *res;
res = dev_get_resource(dev, IORESOURCE_MEM, num);
if (!res)
if (IS_ERR(res))
return NULL;
res = request_iomem_region(dev_name(dev), res->start, res->end);

4
drivers/mfd/syscon.c
View File

@ -71,9 +71,9 @@ static int syscon_probe(struct device_d *dev)
return -ENOMEM;
res = dev_get_resource(dev, IORESOURCE_MEM, 0);
if (!res) {
if (IS_ERR(res)) {
free(syscon);
return -ENOENT;
return PTR_ERR(res);
}
res = request_iomem_region(dev_name(dev), res->start, res->end);

2
drivers/misc/sram.c
View File

@ -48,6 +48,8 @@ static int sram_probe(struct device_d *dev)
cdev_find_free_index("sram"));
res = dev_get_resource(dev, IORESOURCE_MEM, 0);
if (IS_ERR(res))
return PTR_ERR(res);
sram->cdev.size = (unsigned long)resource_size(res);
sram->cdev.ops = &memops;

8
drivers/serial/serial_ns16550.c
View File

@ -317,8 +317,8 @@ static int ns16550_init_iomem(struct device_d *dev, struct ns16550_priv *priv)
int width;
res = dev_get_resource(dev, IORESOURCE_MEM, 0);
if (!res)
return -ENODEV;
if (IS_ERR(res))
return PTR_ERR(res);
priv->mmiobase = dev_request_mem_region(dev, 0);
@ -347,8 +347,8 @@ static int ns16550_init_ioport(struct device_d *dev, struct ns16550_priv *priv)
int width;
res = dev_get_resource(dev, IORESOURCE_IO, 0);
if (!res)
return -ENODEV;
if (IS_ERR(res))
return PTR_ERR(res);
res = request_ioport_region(dev_name(dev), res->start, res->end);
if (!res)