Re: [PATCH] ACPI/nfit: delete the function to_acpi_nfit_desc

2019-01-08 Thread Dan Williams
On Sat, Jan 5, 2019 at 12:09 AM Xiaochun Lee  wrote:
>
> From: Xiaochun Lee 
>
> 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: Xiaochun Lee 

Good catch, thanks, applied.


[PATCH] ACPI/nfit: delete the function to_acpi_nfit_desc

2019-01-05 Thread Xiaochun Lee
From: Xiaochun Lee 

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: Xiaochun Lee 
---
 drivers/acpi/nfit/core.c | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 011d3db..8f09410 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -78,12 +78,6 @@ const guid_t *to_nfit_uuid(enum nfit_uuids id)
 }
 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)
 {
struct nvdimm_bus_descriptor *nd_desc = _desc->nd_desc;
@@ -419,7 +413,7 @@ static bool payload_dumpable(struct nvdimm *nvdimm, 
unsigned int func)
 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)
 {
-   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);
union acpi_object in_obj, in_buf, *out_obj;
const struct nd_cmd_desc *desc = NULL;
@@ -3367,7 +3361,7 @@ int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, void 
*data, acpi_size sz)
 
 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;
 
/* Bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */
@@ -3384,7 +3378,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,
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)
return 0;
-- 
1.8.3.1




[PATCH] ACPI/nfit: delete the function to_acpi_nfit_desc

2019-01-05 Thread Xiaochun Lee
From: Xiaochun Lee 

The function to_acpi_nfit_desc and function to_acpi_desc
do the same things,So delete the function to_acpi_nfit_desc,
and keep the inline function to_acpi_desc.

The calling function to_acpi_nfit_desc,have been changed 
to the calling function to_acpi_desc.

Xiaochun Lee (1):
  ACPI/nfit: delete the function to_acpi_nfit_desc

 drivers/acpi/nfit/core.c | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

-- 
1.8.3.1