[PATCH v2] mmc: sdhci-of-aspeed: Fix kunit-related build error

Randy Dunlap rdunlap at infradead.org
Sat Jan 23 04:23:10 AEDT 2021


On 1/22/21 3:48 AM, Andrew Jeffery wrote:
> Randy found that with the following Kconfig settings we have duplicate
> definitions (e.g. __inittest()) in sdhci-of-aspeed due to competing
> module_init()/module_exit() calls from kunit and driver the itself.
> 
> ```
> CONFIG_MMC_SDHCI_OF_ASPEED=m
> CONFIG_MMC_SDHCI_OF_ASPEED_TEST=y
> ```
> 
> Conditionally open-code the kunit initialisation to avoid the error.
> 
> Fixes: 7efa02a981d6 ("mmc: sdhci-of-aspeed: Add KUnit tests for phase calculations")
> Reported-by: Randy Dunlap <rdunlap at infradead.org>
> Signed-off-by: Andrew Jeffery <andrew at aj.id.au>
> ---
> 
> v2:
> * Collapse the #ifdef-ery
> 
>  drivers/mmc/host/sdhci-of-aspeed-test.c |  9 +++++-
>  drivers/mmc/host/sdhci-of-aspeed.c      | 42 ++++++++++++++++++++++---
>  2 files changed, 45 insertions(+), 6 deletions(-)

Acked-by: Randy Dunlap <rdunlap at infradead.org> # build-tested

Thanks.


-- 
~Randy



More information about the Linux-aspeed mailing list