Commit c18483a8 authored by Hanjun Guo's avatar Hanjun Guo Committed by Rafael J. Wysocki
Browse files

ACPI: memhotplug: Remove 'state' from struct acpi_memory_device 



After commit 315bbae9 ("ACPI / memhotplug: deal with eject request
in hotplug queue"), the memory device state, which is defined in
struct acpi_memory_device, is not actually useful, so remove it along
with symbols related to it.

Signed-off-by: default avatarHanjun Guo <guohanjun@huawei.com>
[ rjw: Subject and changelog edits ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent a1b8638b

drivers/acpi/acpi_memhotplug.c

+1 −11
Original line number Diff line number Diff line
@@ -36,11 +36,6 @@ static const struct acpi_device_id memory_device_ids[] = { 


#ifdef CONFIG_ACPI_HOTPLUG_MEMORY



/* Memory Device States */

#define MEMORY_INVALID_STATE	0

#define MEMORY_POWER_ON_STATE	1

#define MEMORY_POWER_OFF_STATE	2



static int acpi_memory_device_add(struct acpi_device *device,

				  const struct acpi_device_id *not_used);

static void acpi_memory_device_remove(struct acpi_device *device);
@@ -65,7 +60,6 @@ struct acpi_memory_info { 


struct acpi_memory_device {

	struct acpi_device *device;

	unsigned int state;	/* State of the memory device */

	struct list_head res_list;

};
@@ -233,7 +227,6 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device) 
	}

	if (!num_enabled) {

		dev_err(&mem_device->device->dev, "add_memory failed\n");

		mem_device->state = MEMORY_INVALID_STATE;

		return -EINVAL;

	}

	/*
@@ -304,9 +297,6 @@ static int acpi_memory_device_add(struct acpi_device *device, 
		return result;

	}



	/* Set the device state */

	mem_device->state = MEMORY_POWER_ON_STATE;



	result = acpi_memory_check_device(mem_device);

	if (result) {

		acpi_memory_device_free(mem_device);

CRA Git | Maintained and supported by SUSTech CRA and CCSE