| Message ID | 20230516202133.559488-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | mtd: rawnand: ingenic: fix empty stub helper definitions | expand |
Hi, Le mardi 16 mai 2023 à 22:21 +0200, Arnd Bergmann a écrit : > From: Arnd Bergmann <arnd@arndb.de> > > A few functions provide an empty interface definition when > CONFIG_MTD_NAND_INGENIC_ECC is disabled, but they are accidentally > defined as global functions in the header: > > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:39:5: error: no previous > prototype for 'ingenic_ecc_calculate' > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:46:5: error: no previous > prototype for 'ingenic_ecc_correct' > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:53:6: error: no previous > prototype for 'ingenic_ecc_release' > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:57:21: error: no previous > prototype for 'of_ingenic_ecc_get' > > Turn them into 'static inline' definitions instead. > > Fixes: 15de8c6efd0e ("mtd: rawnand: ingenic: Separate top-level and > SoC specific code") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Good catch. Reviewed-by: Paul Cercueil <paul@crapouillou.net> Cheers, -Paul > --- > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h > b/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h > index 2cda439b5e11..017868f59f22 100644 > --- a/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h > +++ b/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h > @@ -36,25 +36,25 @@ int ingenic_ecc_correct(struct ingenic_ecc *ecc, > void ingenic_ecc_release(struct ingenic_ecc *ecc); > struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np); > #else /* CONFIG_MTD_NAND_INGENIC_ECC */ > -int ingenic_ecc_calculate(struct ingenic_ecc *ecc, > +static inline int ingenic_ecc_calculate(struct ingenic_ecc *ecc, > struct ingenic_ecc_params *params, > const u8 *buf, u8 *ecc_code) > { > return -ENODEV; > } > > -int ingenic_ecc_correct(struct ingenic_ecc *ecc, > +static inline int ingenic_ecc_correct(struct ingenic_ecc *ecc, > struct ingenic_ecc_params *params, u8 *buf, > u8 *ecc_code) > { > return -ENODEV; > } > > -void ingenic_ecc_release(struct ingenic_ecc *ecc) > +static inline void ingenic_ecc_release(struct ingenic_ecc *ecc) > { > } > > -struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np) > +static inline struct ingenic_ecc *of_ingenic_ecc_get(struct > device_node *np) > { > return ERR_PTR(-ENODEV); > }
On Tue, 2023-05-16 at 20:21:24 UTC, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > A few functions provide an empty interface definition when > CONFIG_MTD_NAND_INGENIC_ECC is disabled, but they are accidentally > defined as global functions in the header: > > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:39:5: error: no previous prototype for 'ingenic_ecc_calculate' > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:46:5: error: no previous prototype for 'ingenic_ecc_correct' > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:53:6: error: no previous prototype for 'ingenic_ecc_release' > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:57:21: error: no previous prototype for 'of_ingenic_ecc_get' > > Turn them into 'static inline' definitions instead. > > Fixes: 15de8c6efd0e ("mtd: rawnand: ingenic: Separate top-level and SoC specific code") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Reviewed-by: Paul Cercueil <paul@crapouillou.net> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes, thanks. Miquel
diff --git a/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h b/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h index 2cda439b5e11..017868f59f22 100644 --- a/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h +++ b/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h @@ -36,25 +36,25 @@ int ingenic_ecc_correct(struct ingenic_ecc *ecc, void ingenic_ecc_release(struct ingenic_ecc *ecc); struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np); #else /* CONFIG_MTD_NAND_INGENIC_ECC */ -int ingenic_ecc_calculate(struct ingenic_ecc *ecc, +static inline int ingenic_ecc_calculate(struct ingenic_ecc *ecc, struct ingenic_ecc_params *params, const u8 *buf, u8 *ecc_code) { return -ENODEV; } -int ingenic_ecc_correct(struct ingenic_ecc *ecc, +static inline int ingenic_ecc_correct(struct ingenic_ecc *ecc, struct ingenic_ecc_params *params, u8 *buf, u8 *ecc_code) { return -ENODEV; } -void ingenic_ecc_release(struct ingenic_ecc *ecc) +static inline void ingenic_ecc_release(struct ingenic_ecc *ecc) { } -struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np) +static inline struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np) { return ERR_PTR(-ENODEV); }