| Message ID | 20210103151045.67446-1-xypron.glpk@gmx.de |
|---|---|
| State | Accepted |
| Commit | bcb0203c616b907ee39a131693a8718eef338c7b |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/1] mtd: misplaced log.h and dm/devres.h | expand |
On Sun, 3 Jan 2021 at 08:10, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: > > log.h and dm/devres.h are U-Boot includes. So placing them > behind #ifndef __UBOOT__ does not make any sense. > > Fixes: f7ae49fc4f36 ("common: Drop log.h from common header") > Fixes: 61b29b826838 ("dm: core: Require users of devres to include the header") > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > drivers/mtd/mtdcore.c | 2 -- > 1 file changed, 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Sun, Jan 03, 2021 at 04:10:45PM +0100, Heinrich Schuchardt wrote: > log.h and dm/devres.h are U-Boot includes. So placing them > behind #ifndef __UBOOT__ does not make any sense. > > Fixes: f7ae49fc4f36 ("common: Drop log.h from common header") > Fixes: 61b29b826838 ("dm: core: Require users of devres to include the header") > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 1a4dec34d9..0d1f94c6cb 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -9,8 +9,6 @@ */ #ifndef __UBOOT__ -#include <log.h> -#include <dm/devres.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/ptrace.h>
log.h and dm/devres.h are U-Boot includes. So placing them behind #ifndef __UBOOT__ does not make any sense. Fixes: f7ae49fc4f36 ("common: Drop log.h from common header") Fixes: 61b29b826838 ("dm: core: Require users of devres to include the header") Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- drivers/mtd/mtdcore.c | 2 -- 1 file changed, 2 deletions(-) -- 2.29.2