Merge tag 'mips-fixes-for-v2024.04' of https://source.denx.de/u-boot/custodians/u...

[J-u-boot.git] / cmd / nvme.c

diff --git a/cmd/nvme.c b/cmd/nvme.c
index 63a8e5a0c215da24ed0f204a95dbf1ee8385971c..09d5f438fb1a112fd75da207fc139c5ee8d91197 100644 (file)
--- a/cmd/nvme.c
+++ b/cmd/nvme.c
@@ -1,18 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 NXP Semiconductors
  * Copyright (C) 2017 Bin Meng <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <dm.h>
 #include <nvme.h>
 
 static int nvme_curr_dev;
 
-static int do_nvme(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_nvme(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])
 {
        int ret;
 
@@ -27,7 +28,7 @@ static int do_nvme(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                if (strncmp(argv[1], "deta", 4) == 0) {
                        struct udevice *udev;
 
-                       ret = blk_get_device(IF_TYPE_NVME, nvme_curr_dev,
+                       ret = blk_get_device(UCLASS_NVME, nvme_curr_dev,
                                             &udev);
                        if (ret < 0)
                                return CMD_RET_FAILURE;
@@ -38,7 +39,7 @@ static int do_nvme(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                }
        }
 
-       return blk_common_cmd(argc, argv, IF_TYPE_NVME, &nvme_curr_dev);
+       return blk_common_cmd(argc, argv, UCLASS_NVME, &nvme_curr_dev);
 }
 
 U_BOOT_CMD(