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 followgn code as it removes the intermediate
struct nvdimm.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
 drivers/acpi/nfit/core.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

On 7/3/23 06:17, Ben Dooks wrote:
> 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 followgn code as it removes the intermediate

s/followgn/following/

> struct nvdimm.
> 
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>

Reviewed-by: Dave Jiang <dave.jiang@intel.com>
> ---
>   drivers/acpi/nfit/core.c | 27 +++++++++++++--------------
>   1 file changed, 13 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
> index 0fcc247fdfac..9213b426b125 100644
> --- a/drivers/acpi/nfit/core.c
> +++ b/drivers/acpi/nfit/core.c
> @@ -1361,18 +1361,22 @@ 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 +1535,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 +1546,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 +1557,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 +1577,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 +1586,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);
>   }

On Mon, 2023-07-03 at 14:17 +0100, Ben Dooks wrote:
> 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 followgn code as it removes the intermediate
> struct nvdimm.
> 
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> ---
>  drivers/acpi/nfit/core.c | 27 +++++++++++++--------------
>  1 file changed, 13 insertions(+), 14 deletions(-)
> 

Modulo the typo Dave pointed out,

Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>

On Mon, Jul 03, 2023 at 02:17:29PM +0100, Ben Dooks wrote:
> 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 followgn code as it removes the intermediate
> struct nvdimm.
> 

Hi Ben,
This a useful cleanup. Minor comments below.
Alison

> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> ---
>  drivers/acpi/nfit/core.c | 27 +++++++++++++--------------
>  1 file changed, 13 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
> index 0fcc247fdfac..9213b426b125 100644
> --- a/drivers/acpi/nfit/core.c
> +++ b/drivers/acpi/nfit/core.c
> @@ -1361,18 +1361,22 @@ 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);

I was going to say add a space before that return, but checkpatch
beat me to it, with a warning. Please fix that up.
WARNING: Missing a blank line after declarations

> +}
> +
> +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);
>  }

I was a bit puzzled why the diff looked awkward because when I applied
the patch it fell nicely in order with the new helper function first.
It all merges the same in the end but it's easier on reviewers eyes
when well presented. Consider using diff.algorithm=patience (output
shown below) when things scramble needlessly.

--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1361,18 +1361,22 @@ static const struct attribute_group *acpi_nfit_attribute_groups[] = {
 	NULL,
 };
 
+static struct nfit_mem *to_nfit_mem(struct device *dev)
+{
+	struct nvdimm *nvdimm = to_nvdimm(dev);
+	return  nvdimm_provider_data(nvdimm);
+}
+
 static struct acpi_nfit_memory_map *to_nfit_memdev(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 __to_nfit_memdev(nfit_mem);
 }

snip

>