spi: omap3: fix claim/release bus within DM

[u-boot] / drivers / nvme / nvme-uclass.c

diff --git a/drivers/nvme/nvme-uclass.c b/drivers/nvme/nvme-uclass.c
index 0895bc9c249678d0e4130288836d00538fe2127c..2d88efdb619ba6500a76631ac52842f4ddfe945d 100644 (file)
--- a/drivers/nvme/nvme-uclass.c
+++ b/drivers/nvme/nvme-uclass.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 NXP Semiconductors
  * Copyright (C) 2017 Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -11,43 +10,26 @@
 #include <dm/device.h>
 #include "nvme.h"
 
-static int nvme_info_init(struct uclass *uc)
-{
-       struct nvme_info *info = (struct nvme_info *)uc->priv;
-
-       info->ns_num = 0;
-       info->ndev_num = 0;
-       INIT_LIST_HEAD(&info->dev_list);
-       nvme_info = info;
-
-       return 0;
-}
-
 static int nvme_uclass_post_probe(struct udevice *udev)
 {
        char name[20];
-       char *str;
        struct udevice *ns_udev;
        int i, ret;
        struct nvme_dev *ndev = dev_get_priv(udev);
 
        /* Create a blk device for each namespace */
        for (i = 0; i < ndev->nn; i++) {
-               sprintf(name, "nvme-blk#%d", nvme_info->ns_num);
-               str = strdup(name);
-               if (!str)
-                       return -ENOMEM;
+               /*
+                * Encode the namespace id to the device name so that
+                * we can extract it when doing the probe.
+                */
+               sprintf(name, "blk#%d", i);
 
                /* The real blksz and size will be set by nvme_blk_probe() */
-               ret = blk_create_device(udev, "nvme-blk", str, IF_TYPE_NVME,
-                                       nvme_info->ns_num++, 512, 0, &ns_udev);
-               if (ret) {
-                       free(str);
-                       nvme_info->ns_num--;
-
+               ret = blk_create_devicef(udev, "nvme-blk", name, IF_TYPE_NVME,
+                                        -1, 512, 0, &ns_udev);
+               if (ret)
                        return ret;
-               }
-               device_set_name_alloced(ns_udev);
        }
 
        return 0;
@@ -56,7 +38,5 @@ static int nvme_uclass_post_probe(struct udevice *udev)
 UCLASS_DRIVER(nvme) = {
        .name   = "nvme",
        .id     = UCLASS_NVME,
-       .init   = nvme_info_init,
        .post_probe = nvme_uclass_post_probe,
-       .priv_auto_alloc_size = sizeof(struct nvme_info),
 };