| Message ID | 20230728093810.2985324-1-AVKrasnov@sberdevices.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1] mtd: rawnand: meson: fix build error | expand |
On Fri, 2023-07-28 at 09:38:10 UTC, Arseniy Krasnov wrote: > Fixes the following build error: > > drivers/mtd/nand/raw/meson_nand.c:244:59: error: initializer element is not a compile-time constant > static const struct nand_ecc_step_info axg_stepinfo[] = { axg_stepinfo_1024, axg_stepinfo_512 }; > ^~~~~~~~~~~~~~~~~ > > Fixes: 0e1db39336d8 ("mtd: rawnand: meson: support for 512B ECC step size") > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202307281007.MMuVjmJ9-lkp@intel.com/ > Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks. Miquel
diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index ff673a9d52af..561d46d860b7 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -229,20 +229,20 @@ NAND_ECC_CAPS_SINGLE(meson_gxl_ecc_caps, meson_nand_calc_ecc_bytes, 1024, 8, 24, 30, 40, 50, 60); static const int axg_stepinfo_strengths[] = { 8 }; -static const struct nand_ecc_step_info axg_stepinfo_1024 = { - .stepsize = 1024, - .strengths = axg_stepinfo_strengths, - .nstrengths = ARRAY_SIZE(axg_stepinfo_strengths) -}; -static const struct nand_ecc_step_info axg_stepinfo_512 = { - .stepsize = 512, - .strengths = axg_stepinfo_strengths, - .nstrengths = ARRAY_SIZE(axg_stepinfo_strengths) +static const struct nand_ecc_step_info axg_stepinfo[] = { + { + .stepsize = 1024, + .strengths = axg_stepinfo_strengths, + .nstrengths = ARRAY_SIZE(axg_stepinfo_strengths) + }, + { + .stepsize = 512, + .strengths = axg_stepinfo_strengths, + .nstrengths = ARRAY_SIZE(axg_stepinfo_strengths) + }, }; -static const struct nand_ecc_step_info axg_stepinfo[] = { axg_stepinfo_1024, axg_stepinfo_512 }; - static const struct nand_ecc_caps meson_axg_ecc_caps = { .stepinfos = axg_stepinfo, .nstepinfos = ARRAY_SIZE(axg_stepinfo),
Fixes the following build error: drivers/mtd/nand/raw/meson_nand.c:244:59: error: initializer element is not a compile-time constant static const struct nand_ecc_step_info axg_stepinfo[] = { axg_stepinfo_1024, axg_stepinfo_512 }; ^~~~~~~~~~~~~~~~~ Fixes: 0e1db39336d8 ("mtd: rawnand: meson: support for 512B ECC step size") Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202307281007.MMuVjmJ9-lkp@intel.com/ Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> --- drivers/mtd/nand/raw/meson_nand.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)