video: add guards around 16bpp/32bbp code

[oweals/u-boot.git] / drivers / nvme / nvme.h

diff --git a/drivers/nvme/nvme.h b/drivers/nvme/nvme.h
index cd411be83d550287dbdcfb25eba931f81d7b413a..0e8cb221a7a2d5cda4ae84badf8c68d199d04bb3 100644 (file)
--- a/drivers/nvme/nvme.h
+++ b/drivers/nvme/nvme.h
@@ -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+
  */
 
 #ifndef __DRIVER_NVME_H__
@@ -621,19 +620,13 @@ struct nvme_dev {
        char model[40];
        char firmware_rev[8];
        u32 max_transfer_shift;
+       u64 cap;
        u32 stripe_size;
        u32 page_size;
        u8 vwc;
        u64 *prp_pool;
        u32 prp_entry_num;
        u32 nn;
-       u32 blk_dev_start;
-};
-
-struct nvme_info {
-       int ns_num;     /*the number of nvme namespaces*/
-       int ndev_num;   /*the number of nvme devices*/
-       struct list_head dev_list;
 };
 
 /*
@@ -644,6 +637,7 @@ struct nvme_ns {
        struct list_head list;
        struct nvme_dev *dev;
        unsigned ns_id;
+       u8 eui64[8];
        int devnum;
        int lba_shift;
        u8 flbas;
@@ -651,6 +645,4 @@ struct nvme_ns {
        u32 mode_select_block_len;
 };
 
-extern struct nvme_info *nvme_info;
-
 #endif /* __DRIVER_NVME_H__ */