| Message ID | 20230718-asoc-topology-kunit-enable-v2-2-0ee11e662b92@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a0c74f6c9ea9cebd7a8f38142bf87e7c12c2905d |
| Headers | show |
| Series | ASoC: Improve coverage in default KUnit runs | expand |
On Tue, 18 Jul 2023 at 08:30, Mark Brown <broonie@kernel.org> wrote: > > The various _ioremap_resource functions are not built when > CONFIG_HAS_IOMEM is disabled but no stubs are provided. Given how > widespread IOMEM usage is in drivers and how rare !IOMEM configurations > are in practical use let's just provide some stubs so users will build > without having to add explicit dependencies on IOMEM. > > The most likely use case is builds with UML for KUnit testing. > > Signed-off-by: Mark Brown <broonie@kernel.org> > --- As with the previous patch, I'm all for this. Reviewed-by: David Gow <davidgow@google.com> Cheers, -- David > include/linux/platform_device.h | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h > index b845fd83f429..7a41c72c1959 100644 > --- a/include/linux/platform_device.h > +++ b/include/linux/platform_device.h > @@ -63,6 +63,8 @@ extern struct resource *platform_get_mem_or_io(struct platform_device *, > extern struct device * > platform_find_device_by_driver(struct device *start, > const struct device_driver *drv); > + > +#ifdef CONFIG_HAS_IOMEM > extern void __iomem * > devm_platform_get_and_ioremap_resource(struct platform_device *pdev, > unsigned int index, struct resource **res); > @@ -72,6 +74,32 @@ devm_platform_ioremap_resource(struct platform_device *pdev, > extern void __iomem * > devm_platform_ioremap_resource_byname(struct platform_device *pdev, > const char *name); > +#else > + > +static inline void __iomem * > +devm_platform_get_and_ioremap_resource(struct platform_device *pdev, > + unsigned int index, struct resource **res) > +{ > + return ERR_PTR(-EINVAL); > +} > + > + > +static inline void __iomem * > +devm_platform_ioremap_resource(struct platform_device *pdev, > + unsigned int index) > +{ > + return ERR_PTR(-EINVAL); > +} > + > +static inline void __iomem * > +devm_platform_ioremap_resource_byname(struct platform_device *pdev, > + const char *name) > +{ > + return ERR_PTR(-EINVAL); > +} > + > +#endif > + > extern int platform_get_irq(struct platform_device *, unsigned int); > extern int platform_get_irq_optional(struct platform_device *, unsigned int); > extern int platform_irq_count(struct platform_device *); > > -- > 2.39.2 >
On Tue, Jul 18, 2023 at 01:28:43AM +0100, Mark Brown wrote: > The various _ioremap_resource functions are not built when > CONFIG_HAS_IOMEM is disabled but no stubs are provided. Given how > widespread IOMEM usage is in drivers and how rare !IOMEM configurations > are in practical use let's just provide some stubs so users will build > without having to add explicit dependencies on IOMEM. > > The most likely use case is builds with UML for KUnit testing. > > Signed-off-by: Mark Brown <broonie@kernel.org> > --- > include/linux/platform_device.h | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index b845fd83f429..7a41c72c1959 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -63,6 +63,8 @@ extern struct resource *platform_get_mem_or_io(struct platform_device *, extern struct device * platform_find_device_by_driver(struct device *start, const struct device_driver *drv); + +#ifdef CONFIG_HAS_IOMEM extern void __iomem * devm_platform_get_and_ioremap_resource(struct platform_device *pdev, unsigned int index, struct resource **res); @@ -72,6 +74,32 @@ devm_platform_ioremap_resource(struct platform_device *pdev, extern void __iomem * devm_platform_ioremap_resource_byname(struct platform_device *pdev, const char *name); +#else + +static inline void __iomem * +devm_platform_get_and_ioremap_resource(struct platform_device *pdev, + unsigned int index, struct resource **res) +{ + return ERR_PTR(-EINVAL); +} + + +static inline void __iomem * +devm_platform_ioremap_resource(struct platform_device *pdev, + unsigned int index) +{ + return ERR_PTR(-EINVAL); +} + +static inline void __iomem * +devm_platform_ioremap_resource_byname(struct platform_device *pdev, + const char *name) +{ + return ERR_PTR(-EINVAL); +} + +#endif + extern int platform_get_irq(struct platform_device *, unsigned int); extern int platform_get_irq_optional(struct platform_device *, unsigned int); extern int platform_irq_count(struct platform_device *);
The various _ioremap_resource functions are not built when CONFIG_HAS_IOMEM is disabled but no stubs are provided. Given how widespread IOMEM usage is in drivers and how rare !IOMEM configurations are in practical use let's just provide some stubs so users will build without having to add explicit dependencies on IOMEM. The most likely use case is builds with UML for KUnit testing. Signed-off-by: Mark Brown <broonie@kernel.org> --- include/linux/platform_device.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)