]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
rockchip: block: simplify rkmtd driver
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Fri, 18 Oct 2024 01:30:13 +0000 (03:30 +0200)
committerTom Rini <trini@konsulko.com>
Thu, 24 Oct 2024 17:20:45 +0000 (11:20 -0600)
By using blk_create_devicef() instead of blk_create_devicef() the driver
can be simplified and brought into line with other block device drivers.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Tested-by: Johan Jonker <jbx6244@gmail.com>
drivers/block/rkmtd.c

index c55f052e51b938396095ae0f807851e94bb43557..f84cacd7ead3c6878d30f201e4e75643b66a0c08 100644 (file)
@@ -794,36 +794,19 @@ int rkmtd_init_plat(struct udevice *dev)
        return 0;
 }
 
-static void rkmtd_blk_kmalloc_release(struct udevice *dev, void *res)
-{
-       /* noop */
-}
-
 static int rkmtd_bind(struct udevice *dev)
 {
        struct rkmtd_dev *plat = dev_get_plat(dev);
-       char dev_name[30], *str;
        struct blk_desc *desc;
        struct udevice *bdev;
        int ret;
 
-       snprintf(dev_name, sizeof(dev_name), "%s.%s", dev->name, "blk");
-
-       str = devres_alloc(rkmtd_blk_kmalloc_release, strlen(dev_name) + 1, GFP_KERNEL);
-       if (unlikely(!str))
-               return -ENOMEM;
-
-       strcpy(str, dev_name);
-
-       ret = blk_create_device(dev, "rkmtd_blk", str, UCLASS_RKMTD,
-                               -1, 512, LBA, &bdev);
+       ret = blk_create_devicef(dev, "rkmtd_blk", "blk", UCLASS_RKMTD,
+                                -1, 512, LBA, &bdev);
        if (ret) {
-               free(str);
                return log_msg_ret("blk", ret);
        }
 
-       devres_add(dev, str);
-
        desc = dev_get_uclass_plat(bdev);
        sprintf(desc->vendor, "0x%.4x", 0x2207);
        memcpy(desc->product, "RKMTD", sizeof("RKMTD"));