On 6/23/20 11:46 AM, Sascha Hauer wrote: > On Mon, Jun 22, 2020 at 10:39:42AM +0200, Ahmad Fatoum wrote: >> On boards like the sama5d27 som1 ek, we have two SD card slots, so error >> messages are more useful if they refer to the SDHCI instance. We didn't >> do this at first, because the common code is compiled for PBL as well. >> With a sprinkle of preprocessor ifdeffery, we can have both. >> >> Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> >> --- >> drivers/mci/atmel-sdhci-common.c | 14 +++++++++----- >> drivers/mci/atmel-sdhci.c | 2 ++ >> drivers/mci/atmel-sdhci.h | 1 + >> 3 files changed, 12 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/mci/atmel-sdhci-common.c b/drivers/mci/atmel-sdhci-common.c >> index 060d1c33d1a5..a83610c3d090 100644 >> --- a/drivers/mci/atmel-sdhci-common.c >> +++ b/drivers/mci/atmel-sdhci-common.c >> @@ -16,6 +16,10 @@ >> >> #ifdef __PBL__ >> #define udelay early_udelay >> +#undef dev_err >> +#define dev_err(d, ...) pr_err(__VA_ARGS__) >> +#undef dev_warn >> +#define dev_warn(d, ...) pr_warn(__VA_ARGS__) >> #endif > > This hunk doesn't apply. Is a patch missing in this series? I have a series for first stage support, but picked out the second stage relevant parts to slim it down. I'll rebase and resend v2. > > Sascha > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
