[PATCH 01/10] ata: platform_ide: cleanup resource requesting
Sascha Hauer
s.hauer at pengutronix.de
Fri Sep 12 03:13:41 PDT 2014
- use dev_request_mem_region to simplify code
- check return values and bail out
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
drivers/ata/intf_platform_ide.c | 47 +++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 25 deletions(-)
diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c
index ecc2546..b3faf47 100644
--- a/drivers/ata/intf_platform_ide.c
+++ b/drivers/ata/intf_platform_ide.c
@@ -81,7 +81,7 @@ static int platform_ide_probe(struct device_d *dev)
int rc;
struct ide_port_info *pdata = dev->platform_data;
struct ide_port *ide;
- void *reg_base, *alt_base;
+ void *reg_base, *alt_base = NULL;
struct resource *reg, *alt;
int mmio;
@@ -90,35 +90,32 @@ static int platform_ide_probe(struct device_d *dev)
return -EINVAL;
}
- alt = NULL;
- reg = dev_get_resource(dev, IORESOURCE_MEM, 0);
- mmio = (reg != NULL);
- if (reg != NULL) {
- reg = request_iomem_region(dev_name(dev), reg->start,
- reg->end);
- alt = dev_get_resource(dev, IORESOURCE_MEM, 1);
- if (alt != NULL)
- alt = request_iomem_region(dev_name(dev), alt->start,
- alt->end);
+ reg_base = dev_request_mem_region(dev, 0);
+ mmio = (reg_base != NULL);
+ if (mmio) {
+ alt_base = dev_request_mem_region(dev, 1);
} else {
reg = dev_get_resource(dev, IORESOURCE_IO, 0);
- if (reg != NULL) {
- reg = request_ioport_region(dev_name(dev), reg->start,
- reg->end);
- alt = dev_get_resource(dev, IORESOURCE_IO, 1);
- if (alt != NULL)
- alt = request_ioport_region(dev_name(dev),
- alt->start,
- alt->end);
+ if (!reg)
+ return -ENODEV;
+
+ reg = request_ioport_region(dev_name(dev), reg->start,
+ reg->end);
+ if (!reg)
+ return -ENODEV;
+
+ reg_base = (void __force __iomem *) reg->start;
+
+ alt = dev_get_resource(dev, IORESOURCE_IO, 1);
+ if (alt) {
+ alt = request_ioport_region(dev_name(dev),
+ alt->start,
+ alt->end);
+ if (!alt)
+ return -ENODEV;
}
}
- reg_base = (reg != NULL ? (void __force __iomem *) reg->start : NULL);
- alt_base = (alt != NULL ? (void __force __iomem *) alt->start : NULL);
-
- if (!reg_base)
- return -ENODEV;
-
ide = xzalloc(sizeof(*ide));
ide->io.mmio = mmio;
--
2.1.0
More information about the barebox
mailing list