diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2016-12-23 10:45:49 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-10 08:27:33 +0100 |
| commit | fb28915aacfe5ae133e6b20b43ffb0708de382f1 (patch) | |
| tree | 308a42b2a4bc796aac74f9e76d2fa0b344f3caf2 /drivers/ata | |
| parent | ba414897e8c31b4fc7ee295262352c7a3e3b6db3 (diff) | |
| download | barebox-fb28915aacfe5ae133e6b20b43ffb0708de382f1.tar.gz barebox-fb28915aacfe5ae133e6b20b43ffb0708de382f1.tar.xz | |
ata: pata-imx: simplify assignment of device name
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@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata-imx.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/ata/pata-imx.c b/drivers/ata/pata-imx.c index c8098a537f..4f75048c12 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; |