Commit 8a7f02f6 authored by Xiaochun Lee's avatar Xiaochun Lee Committed by Dan Williams

ACPI/nfit: delete the function to_acpi_nfit_desc

The function to_acpi_nfit_desc and function to_acpi_desc
do the same things,delete the function to_acpi_nfit_desc,
and keep the inline function to_acpi_desc.
Signed-off-by: default avatarXiaochun Lee <lixc17@lenovo.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent dadbcb45
...@@ -77,12 +77,6 @@ const guid_t *to_nfit_uuid(enum nfit_uuids id) ...@@ -77,12 +77,6 @@ const guid_t *to_nfit_uuid(enum nfit_uuids id)
} }
EXPORT_SYMBOL(to_nfit_uuid); EXPORT_SYMBOL(to_nfit_uuid);
static struct acpi_nfit_desc *to_acpi_nfit_desc(
struct nvdimm_bus_descriptor *nd_desc)
{
return container_of(nd_desc, struct acpi_nfit_desc, nd_desc);
}
static struct acpi_device *to_acpi_dev(struct acpi_nfit_desc *acpi_desc) static struct acpi_device *to_acpi_dev(struct acpi_nfit_desc *acpi_desc)
{ {
struct nvdimm_bus_descriptor *nd_desc = &acpi_desc->nd_desc; struct nvdimm_bus_descriptor *nd_desc = &acpi_desc->nd_desc;
...@@ -418,7 +412,7 @@ static bool payload_dumpable(struct nvdimm *nvdimm, unsigned int func) ...@@ -418,7 +412,7 @@ static bool payload_dumpable(struct nvdimm *nvdimm, unsigned int func)
int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
unsigned int cmd, void *buf, unsigned int buf_len, int *cmd_rc) unsigned int cmd, void *buf, unsigned int buf_len, int *cmd_rc)
{ {
struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc); struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc);
struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm); struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm);
union acpi_object in_obj, in_buf, *out_obj; union acpi_object in_obj, in_buf, *out_obj;
const struct nd_cmd_desc *desc = NULL; const struct nd_cmd_desc *desc = NULL;
...@@ -3366,7 +3360,7 @@ EXPORT_SYMBOL_GPL(acpi_nfit_init); ...@@ -3366,7 +3360,7 @@ EXPORT_SYMBOL_GPL(acpi_nfit_init);
static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc) static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
{ {
struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc); struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc);
struct device *dev = acpi_desc->dev; struct device *dev = acpi_desc->dev;
/* Bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */ /* Bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */
...@@ -3383,7 +3377,7 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc) ...@@ -3383,7 +3377,7 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
static int __acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc, static int __acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,
struct nvdimm *nvdimm, unsigned int cmd) struct nvdimm *nvdimm, unsigned int cmd)
{ {
struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc); struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc);
if (nvdimm) if (nvdimm)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment