[PATCH] ata: pata-imx: simplify assignment of device name

Uwe Kleine-König u.kleine-koenig at pengutronix.de
Fri Dec 23 01:45:49 PST 2016


If OF_DEVICE isn't enabled, of_alias_get returns NULL. Also xstrdup
returns NULL when NULL is passed as argument. This allows to simplify
accordingly.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
---
 drivers/ata/pata-imx.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/ata/pata-imx.c b/drivers/ata/pata-imx.c
index c8098a537fe5..4f75048c12ce 100644
--- a/drivers/ata/pata-imx.c
+++ b/drivers/ata/pata-imx.c
@@ -158,7 +158,6 @@ static int imx_pata_probe(struct device_d *dev)
 	struct clk *clk;
 	void __iomem *base;
 	int ret;
-	const char *devname = NULL;
 
 	ide = xzalloc(sizeof(*ide));
 	iores = dev_request_mem_resource(dev, 0);
@@ -182,14 +181,9 @@ static int imx_pata_probe(struct device_d *dev)
 
 	pata_imx_set_bus_timing(base, clk_get_rate(clk), 4);
 
-	if (IS_ENABLED(CONFIG_OFDEVICE)) {
-		devname = of_alias_get(dev->device_node);
-		if (devname)
-			devname = xstrdup(devname);
-	}
 
 	ide->port.dev = dev;
-	ide->port.devname = devname;
+	ide->port.devname = xstrdup(of_alias_get(dev->device_node));
 
 	dev->priv = ide;
 	dev->detect = pata_imx_detect;
-- 
2.11.0




More information about the barebox mailing list