| Message ID | 20220429134039.18252-1-msuchanek@suse.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | dccfbc73a9ddd2c7232696f563c39d0ca09ae905 |
| Headers | show |
| Series | testing: nvdimm: iomap: make __nfit_test_ioremap a macro | expand |
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 >
On Fri, Apr 29, 2022 at 6:41 AM Michal Suchanek <msuchanek@suse.de> 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. > Looks reasonable to me and passes tests, applied. > 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 >
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)
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. Signed-off-by: Michal Suchanek <msuchanek@suse.de> --- tools/testing/nvdimm/test/iomap.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)