We now have proper types for all users, we can drop this one.

Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <raf...@kernel.org>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: Pavel Tatashin <pasha.tatas...@oracle.com>
Cc: Stephen Rothwell <s...@canb.auug.org.au>
Cc: Andrew Banman <andrew.ban...@hpe.com>
Cc: "mike.tra...@hpe.com" <mike.tra...@hpe.com>
Cc: Oscar Salvador <osalva...@suse.com>
Cc: Dave Hansen <dave.han...@linux.intel.com>
Cc: Michal Hocko <mho...@kernel.org>
Cc: Michal Suchánek <msucha...@suse.de>
Cc: Vitaly Kuznetsov <vkuzn...@redhat.com>
Cc: Dan Williams <dan.j.willi...@intel.com>
Cc: Pavel Tatashin <pavel.tatas...@microsoft.com>
Signed-off-by: David Hildenbrand <da...@redhat.com>
---
 drivers/base/memory.c  | 3 ---
 include/linux/memory.h | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index c5fdca7a3009..a6e524f0ea38 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -388,9 +388,6 @@ static ssize_t type_show(struct device *dev, struct 
device_attribute *attr,
        ssize_t len = 0;
 
        switch (mem->type) {
-       case MEMORY_BLOCK_UNSPECIFIED:
-               len = sprintf(buf, "unspecified\n");
-               break;
        case MEMORY_BLOCK_BOOT:
                len = sprintf(buf, "boot\n");
                break;
diff --git a/include/linux/memory.h b/include/linux/memory.h
index a3a1e9764805..11679622f743 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -50,10 +50,6 @@ int set_memory_block_size_order(unsigned int order);
  *  No memory block is to be created (e.g. device memory). Not exposed to
  *  user space.
  *
- * MEMORY_BLOCK_UNSPECIFIED:
- *  The type of memory block was not further specified when adding the
- *  memory block.
- *
  * MEMORY_BLOCK_BOOT:
  *  This memory block was added during boot by the basic system. No
  *  specific device driver takes care of this memory block. This memory
@@ -103,7 +99,6 @@ int set_memory_block_size_order(unsigned int order);
  */
 enum {
        MEMORY_BLOCK_NONE = 0,
-       MEMORY_BLOCK_UNSPECIFIED,
        MEMORY_BLOCK_BOOT,
        MEMORY_BLOCK_DIMM,
        MEMORY_BLOCK_DIMM_UNREMOVABLE,
-- 
2.17.2

Reply via email to