summaryrefslogtreecommitdiffstats
path: root/drivers/aiodev/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/aiodev/core.c')
-rw-r--r--drivers/aiodev/core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/aiodev/core.c b/drivers/aiodev/core.c
index 79f935d710..b5d06da932 100644
--- a/drivers/aiodev/core.c
+++ b/drivers/aiodev/core.c
@@ -106,8 +106,6 @@ int aiodevice_register(struct aiodevice *aiodev)
aiodev->dev.id = DEVICE_ID_SINGLE;
aiodev->name = of_alias_get(aiodev->hwdev->device_node);
- if (!aiodev->name)
- aiodev->name = aiodev->hwdev->device_node->name;
}
if (!aiodev->name) {
@@ -115,7 +113,7 @@ int aiodevice_register(struct aiodevice *aiodev)
aiodev->dev.id = DEVICE_ID_DYNAMIC;
}
- strcpy(aiodev->dev.name, aiodev->name);
+ dev_set_name(&aiodev->dev, aiodev->name);
aiodev->dev.parent = aiodev->hwdev;