[SCSI] 3w-9xxx: remove unnecessary local_irq_save/restore for scsi sg copy API

[linux-2.6-omap-h63xx.git] / drivers / s390 / s390_rdev.c

diff --git a/drivers/s390/s390_rdev.c b/drivers/s390/s390_rdev.c
index e3f64716982786f23878d4554dc023ab25513452..64371c05a3b37a1cac8ca1df37bb4b93389953d1 100644 (file)
--- a/drivers/s390/s390_rdev.c
+++ b/drivers/s390/s390_rdev.c
@@ -27,11 +27,10 @@ s390_root_dev_register(const char *name)
 
        if (!strlen(name))
                return ERR_PTR(-EINVAL);
-       dev = kmalloc(sizeof(struct device), GFP_KERNEL);
+       dev = kzalloc(sizeof(struct device), GFP_KERNEL);
        if (!dev)
                return ERR_PTR(-ENOMEM);
-       memset(dev, 0, sizeof(struct device));
-       strncpy(dev->bus_id, name, min(strlen(name), (size_t)BUS_ID_SIZE));
+       dev_set_name(dev, name);
        dev->release = s390_root_dev_release;
        ret = device_register(dev);
        if (ret) {