Merge tag 's390-6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-block.git] / drivers / s390 / net / smsgiucv_app.c

diff --git a/drivers/s390/net/smsgiucv_app.c b/drivers/s390/net/smsgiucv_app.c
index 0a263999f7ae44b181ac7dc786908698c42a9974..cc44cbb0028b20f67020b55155a6aba3ba941c5d 100644 (file)
--- a/drivers/s390/net/smsgiucv_app.c
+++ b/drivers/s390/net/smsgiucv_app.c
@@ -156,25 +156,14 @@ static int __init smsgiucv_app_init(void)
        if (!MACHINE_IS_VM)
                return -ENODEV;
 
-       smsg_app_dev = kzalloc(sizeof(*smsg_app_dev), GFP_KERNEL);
-       if (!smsg_app_dev)
-               return -ENOMEM;
-
        smsgiucv_drv = driver_find(SMSGIUCV_DRV_NAME, &iucv_bus);
-       if (!smsgiucv_drv) {
-               kfree(smsg_app_dev);
+       if (!smsgiucv_drv)
                return -ENODEV;
-       }
 
-       rc = dev_set_name(smsg_app_dev, KMSG_COMPONENT);
-       if (rc) {
-               kfree(smsg_app_dev);
-               goto fail;
-       }
-       smsg_app_dev->bus = &iucv_bus;
-       smsg_app_dev->parent = iucv_root;
-       smsg_app_dev->release = (void (*)(struct device *)) kfree;
-       smsg_app_dev->driver = smsgiucv_drv;
+       smsg_app_dev = iucv_alloc_device(NULL, smsgiucv_drv, NULL, KMSG_COMPONENT);
+       if (!smsg_app_dev)
+               return -ENOMEM;
+
        rc = device_register(smsg_app_dev);
        if (rc) {
                put_device(smsg_app_dev);