Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 29 Apr 2022 17:48:47 +0200
From:   Michal =?iso-8859-1?Q?Such=E1nek?= <msuchanek@suse.de>
To:     nvdimm@lists.linux.dev
Cc:     Dan Williams <dan.j.williams@intel.com>,
        Vishal Verma <vishal.l.verma@intel.com>,
        Dave Jiang <dave.jiang@intel.com>,
        Ira Weiny <ira.weiny@intel.com>, Zou Wei <zou_wei@huawei.com>,
        Bjorn Helgaas <bhelgaas@google.com>,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] testing: nvdimm: iomap: make __nfit_test_ioremap a macro
Message-ID: <20220429154847.GN163591@kunlun.suse.cz>
References: <20220429134039.18252-1-msuchanek@suse.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220429134039.18252-1-msuchanek@suse.de>
User-Agent: Mutt/1.10.1 (2018-07-13)
Precedence: bulk

On Fri, Apr 29, 2022 at 03:40:39PM +0200, Michal Suchanek wrote:
> The ioremap passed as argument to __nfit_test_ioremap can be a macro so
> it cannot be passed as function argument. Make __nfit_test_ioremap into
> a macro so that ioremap can be passed as untyped macro argument.

Fixes: 6bc756193ff6 ("tools/testing/nvdimm: libnvdimm unit test infrastructure")

The fallback_fn was passed around to start with, and ioremap was already
a define when this was merged.

> Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> ---
>  tools/testing/nvdimm/test/iomap.c | 18 ++++++++----------
>  1 file changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c
> index b752ce47ead3..ea956082e6a4 100644
> --- a/tools/testing/nvdimm/test/iomap.c
> +++ b/tools/testing/nvdimm/test/iomap.c
> @@ -62,16 +62,14 @@ struct nfit_test_resource *get_nfit_res(resource_size_t resource)
>  }
>  EXPORT_SYMBOL(get_nfit_res);
>  
> -static void __iomem *__nfit_test_ioremap(resource_size_t offset, unsigned long size,
> -		void __iomem *(*fallback_fn)(resource_size_t, unsigned long))
> -{
> -	struct nfit_test_resource *nfit_res = get_nfit_res(offset);
> -
> -	if (nfit_res)
> -		return (void __iomem *) nfit_res->buf + offset
> -			- nfit_res->res.start;
> -	return fallback_fn(offset, size);
> -}
> +#define __nfit_test_ioremap(offset, size, fallback_fn) ({		\
> +	struct nfit_test_resource *nfit_res = get_nfit_res(offset);	\
> +	nfit_res ?							\
> +		(void __iomem *) nfit_res->buf + (offset)		\
> +			- nfit_res->res.start				\
> +	:								\
> +		fallback_fn((offset), (size)) ;				\
> +})
>  
>  void __iomem *__wrap_devm_ioremap(struct device *dev,
>  		resource_size_t offset, unsigned long size)
> -- 
> 2.34.1
>