resource: Let dev_get_resource return an error pointer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
dde56d42ad
commit
9d518ba397
|
@ -97,8 +97,8 @@ static int platform_ide_probe(struct device_d *dev)
|
||||||
alt_base = dev_request_mem_region(dev, 1);
|
alt_base = dev_request_mem_region(dev, 1);
|
||||||
} else {
|
} else {
|
||||||
reg = dev_get_resource(dev, IORESOURCE_IO, 0);
|
reg = dev_get_resource(dev, IORESOURCE_IO, 0);
|
||||||
if (!reg)
|
if (IS_ERR(reg))
|
||||||
return -ENODEV;
|
return PTR_ERR(reg);
|
||||||
|
|
||||||
reg = request_ioport_region(dev_name(dev), reg->start,
|
reg = request_ioport_region(dev_name(dev), reg->start,
|
||||||
reg->end);
|
reg->end);
|
||||||
|
@ -108,7 +108,7 @@ static int platform_ide_probe(struct device_d *dev)
|
||||||
reg_base = (void __force __iomem *) reg->start;
|
reg_base = (void __force __iomem *) reg->start;
|
||||||
|
|
||||||
alt = dev_get_resource(dev, IORESOURCE_IO, 1);
|
alt = dev_get_resource(dev, IORESOURCE_IO, 1);
|
||||||
if (alt) {
|
if (!IS_ERR(alt)) {
|
||||||
alt = request_ioport_region(dev_name(dev),
|
alt = request_ioport_region(dev_name(dev),
|
||||||
alt->start,
|
alt->start,
|
||||||
alt->end);
|
alt->end);
|
||||||
|
|
|
@ -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)
|
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;
|
struct resource *res;
|
||||||
|
|
||||||
res = dev_get_resource(dev, IORESOURCE_MEM, num);
|
res = dev_get_resource(dev, IORESOURCE_MEM, num);
|
||||||
if (!res)
|
if (IS_ERR(res))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
return (void __force *)res->start;
|
return (void __force *)res->start;
|
||||||
|
@ -323,7 +323,7 @@ void __iomem *dev_request_mem_region(struct device_d *dev, int num)
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
|
|
||||||
res = dev_get_resource(dev, IORESOURCE_MEM, num);
|
res = dev_get_resource(dev, IORESOURCE_MEM, num);
|
||||||
if (!res)
|
if (IS_ERR(res))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
res = request_iomem_region(dev_name(dev), res->start, res->end);
|
res = request_iomem_region(dev_name(dev), res->start, res->end);
|
||||||
|
|
|
@ -71,9 +71,9 @@ static int syscon_probe(struct device_d *dev)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
res = dev_get_resource(dev, IORESOURCE_MEM, 0);
|
res = dev_get_resource(dev, IORESOURCE_MEM, 0);
|
||||||
if (!res) {
|
if (IS_ERR(res)) {
|
||||||
free(syscon);
|
free(syscon);
|
||||||
return -ENOENT;
|
return PTR_ERR(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
res = request_iomem_region(dev_name(dev), res->start, res->end);
|
res = request_iomem_region(dev_name(dev), res->start, res->end);
|
||||||
|
|
|
@ -48,6 +48,8 @@ static int sram_probe(struct device_d *dev)
|
||||||
cdev_find_free_index("sram"));
|
cdev_find_free_index("sram"));
|
||||||
|
|
||||||
res = dev_get_resource(dev, IORESOURCE_MEM, 0);
|
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.size = (unsigned long)resource_size(res);
|
||||||
sram->cdev.ops = &memops;
|
sram->cdev.ops = &memops;
|
||||||
|
|
|
@ -317,8 +317,8 @@ static int ns16550_init_iomem(struct device_d *dev, struct ns16550_priv *priv)
|
||||||
int width;
|
int width;
|
||||||
|
|
||||||
res = dev_get_resource(dev, IORESOURCE_MEM, 0);
|
res = dev_get_resource(dev, IORESOURCE_MEM, 0);
|
||||||
if (!res)
|
if (IS_ERR(res))
|
||||||
return -ENODEV;
|
return PTR_ERR(res);
|
||||||
|
|
||||||
priv->mmiobase = dev_request_mem_region(dev, 0);
|
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;
|
int width;
|
||||||
|
|
||||||
res = dev_get_resource(dev, IORESOURCE_IO, 0);
|
res = dev_get_resource(dev, IORESOURCE_IO, 0);
|
||||||
if (!res)
|
if (IS_ERR(res))
|
||||||
return -ENODEV;
|
return PTR_ERR(res);
|
||||||
|
|
||||||
res = request_ioport_region(dev_name(dev), res->start, res->end);
|
res = request_ioport_region(dev_name(dev), res->start, res->end);
|
||||||
if (!res)
|
if (!res)
|
||||||
|
|
Loading…
Reference in New Issue