spi: omap3: fix claim/release bus within DM

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

diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index 67f7d75f4f8cdb798a1320592680c12f1307ae06..eb6fdeda5015b33ce7d52b5b62201d2d3d0dd729 100644 (file)
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.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>
@@ -13,8 +12,6 @@
 #include <dm/device-internal.h>
 #include "nvme.h"
 
-struct nvme_info *nvme_info;
-
 #define NVME_Q_DEPTH           2
 #define NVME_AQ_DEPTH          2
 #define NVME_SQ_SIZE(depth)    (depth * sizeof(struct nvme_command))
@@ -564,9 +561,6 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
        if (result <= 0)
                return result;
 
-       if (result < nr_io_queues)
-               nr_io_queues = result;
-
        dev->max_qid = nr_io_queues;
 
        /* Free previously allocated queues */
@@ -650,7 +644,8 @@ static int nvme_blk_probe(struct udevice *udev)
 
        memset(ns, 0, sizeof(*ns));
        ns->dev = ndev;
-       ns->ns_id = desc->devnum - ndev->blk_dev_start + 1;
+       /* extract the namespace id from the block device name */
+       ns->ns_id = trailing_strtol(udev->name) + 1;
        if (nvme_identify(ndev, ns->ns_id, 0, (dma_addr_t)id))
                return -EIO;
 
@@ -724,7 +719,7 @@ static ulong nvme_blk_rw(struct udevice *udev, lbaint_t blknr,
                                &c, NULL, IO_TIMEOUT);
                if (status)
                        break;
-               temp_len -= lbas << ns->lba_shift;
+               temp_len -= (u32)lbas << ns->lba_shift;
                buffer += lbas << ns->lba_shift;
        }
 
@@ -762,8 +757,10 @@ U_BOOT_DRIVER(nvme_blk) = {
 
 static int nvme_bind(struct udevice *udev)
 {
+       static int ndev_num;
        char name[20];
-       sprintf(name, "nvme#%d", nvme_info->ndev_num++);
+
+       sprintf(name, "nvme#%d", ndev_num++);
 
        return device_set_name(udev, name);
 }
@@ -790,8 +787,7 @@ static int nvme_probe(struct udevice *udev)
                printf("Error: %s: Out of memory!\n", udev->name);
                goto free_nvme;
        }
-       memset(ndev->queues, 0,
-              sizeof(NVME_Q_NUM * sizeof(struct nvme_queue *)));
+       memset(ndev->queues, 0, NVME_Q_NUM * sizeof(struct nvme_queue *));
 
        ndev->prp_pool = malloc(MAX_PRP_POOL);
        if (!ndev->prp_pool) {
@@ -815,8 +811,6 @@ static int nvme_probe(struct udevice *udev)
                goto free_queue;
 
        nvme_get_info_from_identify(ndev);
-       ndev->blk_dev_start = nvme_info->ns_num;
-       list_add(&ndev->node, &nvme_info->dev_list);
 
        return 0;