ACPI: NFIT: add helper to_nfit_mem() to take device to nfit_mem
Subsystems (2)
PATCH v2 1/1 ACPI: NFIT: add helper to_nfit_mem() to take device to nfit_mem
Add a quick helper to just do struct device to the struct nfit_mem field it should be referencing. This reduces the number of code lines in some of the following code as it removes the intermediate struct nvdimm.
Signed-off-by Ben Dooks <[email protected]>
---
v2:
- fix typo of follwoing
- add blank line in to_nfit_mem()
--- drivers/acpi/nfit/core.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/acpi/nfit/core.c +14 -14
@@ -1361,18 +1361,23 @@ static const struct attribute_group *acpi_nfit_attribute_groups[] = { NULL, }; -static struct acpi_nfit_memory_map *to_nfit_memdev (struct device *dev) +static struct nfit_mem *to_nfit_mem (struct device *dev) {struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); + +return nvdimm_provider_data (nvdimm); +} + +static struct acpi_nfit_memory_map *to_nfit_memdev (struct device *dev) +{ +struct nfit_mem *nfit_mem =to_nfit_mem (dev);return __to_nfit_memdev (nfit_mem); }static struct acpi_nfit_control_region *to_nfit_dcr (struct device *dev) { -struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); +struct nfit_mem *nfit_mem =to_nfit_mem (dev);return nfit_mem->dcr; }
@@ -1531,8 +1536,7 @@ static DEVICE_ATTR_RO(serial);static ssize_t family_show (struct device *dev,struct device_attribute *attr,char *buf) { -struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); +struct nfit_mem *nfit_mem =to_nfit_mem (dev);if (nfit_mem->family <0 )return -ENXIO ;
@@ -1543,8 +1547,7 @@ static DEVICE_ATTR_RO(family);static ssize_t dsm_mask_show (struct device *dev,struct device_attribute *attr,char *buf) { -struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); +struct nfit_mem *nfit_mem =to_nfit_mem (dev);if (nfit_mem->family <0 )return -ENXIO ;
@@ -1555,8 +1558,7 @@ static DEVICE_ATTR_RO(dsm_mask);static ssize_t flags_show (struct device *dev,struct device_attribute *attr,char *buf) { -struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); +struct nfit_mem *nfit_mem =to_nfit_mem (dev);u16 flags =__to_nfit_memdev (nfit_mem)->flags;if (test_bit (NFIT_MEM_DIRTY , &nfit_mem->flags))
@@ -1576,8 +1578,7 @@ static DEVICE_ATTR_RO(flags);static ssize_t id_show (struct device *dev,struct device_attribute *attr,char *buf) { -struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); +struct nfit_mem *nfit_mem =to_nfit_mem (dev);return sprintf (buf,"%s\n" , nfit_mem->id); }
@@ -1586,8 +1587,7 @@ static DEVICE_ATTR_RO(id);static ssize_t dirty_shutdown_show (struct device *dev,struct device_attribute *attr,char *buf) { -struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); +struct nfit_mem *nfit_mem =to_nfit_mem (dev);return sprintf (buf,"%d\n" , nfit_mem->dirty_shutdown); }
Signature · 1 line
2.40.1
Quoted 6 lines · Ben Dooks
Add a quick helper to just do struct device to the struct
nfit_memfield it should be referencing. This reduces the number of code lines in some of the following code as it removes the intermediate struct nvdimm.Signed-off-by Ben Dooks <[email protected]>
Reviewed-by Alison Schofield <[email protected]>
Quoted 94 lines
---
v2:
- fix typo of follwoing
- add blank line into_nfit_mem()--- drivers/acpi/nfit/core.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)drivers/acpi/nfit/core.c +14
-14@@ -1361,18 +1361,23 @@ static const struct attribute_group *acpi_nfit_attribute_groups[] = { NULL, }; -static struct acpi_nfit_memory_map *to_nfit_memdev (struct device *dev) +static struct nfit_mem *to_nfit_mem (struct device *dev) {struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); + +return nvdimm_provider_data (nvdimm); +} + +static struct acpi_nfit_memory_map *to_nfit_memdev (struct device *dev) +{ +struct nfit_mem *nfit_mem =to_nfit_mem (dev);return __to_nfit_memdev (nfit_mem); }static struct acpi_nfit_control_region *to_nfit_dcr (struct device *dev) { -struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); +struct nfit_mem *nfit_mem =to_nfit_mem (dev);return nfit_mem->dcr; }@@ -1531,8 +1536,7 @@ static DEVICE_ATTR_RO(serial);static ssize_t family_show (struct device *dev,struct device_attribute *attr,char *buf) { -struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); +struct nfit_mem *nfit_mem =to_nfit_mem (dev);if (nfit_mem->family <0 )return -ENXIO ;@@ -1543,8 +1547,7 @@ static DEVICE_ATTR_RO(family);static ssize_t dsm_mask_show (struct device *dev,struct device_attribute *attr,char *buf) { -struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); +struct nfit_mem *nfit_mem =to_nfit_mem (dev);if (nfit_mem->family <0 )return -ENXIO ;@@ -1555,8 +1558,7 @@ static DEVICE_ATTR_RO(dsm_mask);static ssize_t flags_show (struct device *dev,struct device_attribute *attr,char *buf) { -struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); +struct nfit_mem *nfit_mem =to_nfit_mem (dev);u16 flags =__to_nfit_memdev (nfit_mem)->flags;if (test_bit (NFIT_MEM_DIRTY , &nfit_mem->flags))@@ -1576,8 +1578,7 @@ static DEVICE_ATTR_RO(flags);static ssize_t id_show (struct device *dev,struct device_attribute *attr,char *buf) { -struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); +struct nfit_mem *nfit_mem =to_nfit_mem (dev);return sprintf (buf,"%s\n" , nfit_mem->id); }@@ -1586,8 +1587,7 @@ static DEVICE_ATTR_RO(id);static ssize_t dirty_shutdown_show (struct device *dev,struct device_attribute *attr,char *buf) { -struct nvdimm *nvdimm =to_nvdimm (dev); -struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm); +struct nfit_mem *nfit_mem =to_nfit_mem (dev);return sprintf (buf,"%d\n" , nfit_mem->dirty_shutdown); }Signature · 1 line
2.40.1