| Message ID | 20200219193934.28456-3-simon.k.r.goldschmidt@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | malloc: implement USE_DL_PREFIX using inline functions | expand |
On Wed, Feb 19, 2020 at 4:40 PM Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com> wrote: > > This reverts commit 8d38a8459b0de45f5ff41f3e11c278a5cf395fd0. You missed to explain the reason for the revert.
On Wed, 19 Feb 2020 at 12:39, Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com> wrote: > > This reverts commit 8d38a8459b0de45f5ff41f3e11c278a5cf395fd0. > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com> > --- > > drivers/mtd/mtdcore.c | 4 ++-- > drivers/mtd/nand/raw/denali.c | 2 +- > drivers/mtd/nand/spi/core.c | 2 +- > drivers/mtd/nand/spi/gigadevice.c | 2 +- > drivers/mtd/nand/spi/macronix.c | 2 +- > drivers/mtd/nand/spi/micron.c | 2 +- > drivers/mtd/nand/spi/winbond.c | 2 +- > include/linux/mtd/mtd.h | 4 ++-- > 8 files changed, 10 insertions(+), 10 deletions(-) Please do add a commit message. Reviewed-by: Simon Glass <sjg at chromium.org>
Am 19.02.2020 um 21:04 schrieb Fabio Estevam: > On Wed, Feb 19, 2020 at 4:40 PM Simon Goldschmidt > <simon.k.r.goldschmidt at gmail.com> wrote: >> >> This reverts commit 8d38a8459b0de45f5ff41f3e11c278a5cf395fd0. > > You missed to explain the reason for the revert. Yes, I'll fix that in v2. Regards, Simon
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index f8d3f4d246..4567e5eb7a 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -1180,10 +1180,10 @@ int mtd_ooblayout_free(struct mtd_info *mtd, int section, if (!mtd || section < 0) return -EINVAL; - if (!mtd->ooblayout || !mtd->ooblayout->rfree) + if (!mtd->ooblayout || !mtd->ooblayout->free) return -ENOTSUPP; - return mtd->ooblayout->rfree(mtd, section, oobfree); + return mtd->ooblayout->free(mtd, section, oobfree); } EXPORT_SYMBOL_GPL(mtd_ooblayout_free); diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c index f51d3e25c7..550fb7c771 100644 --- a/drivers/mtd/nand/raw/denali.c +++ b/drivers/mtd/nand/raw/denali.c @@ -1160,7 +1160,7 @@ static int denali_ooblayout_free(struct mtd_info *mtd, int section, static const struct mtd_ooblayout_ops denali_ooblayout_ops = { .ecc = denali_ooblayout_ecc, - .rfree = denali_ooblayout_free, + .free = denali_ooblayout_free, }; static int denali_multidev_fixup(struct denali_nand_info *denali) diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index cd624ec6ae..5e3704e4d0 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -1023,7 +1023,7 @@ static int spinand_noecc_ooblayout_free(struct mtd_info *mtd, int section, static const struct mtd_ooblayout_ops spinand_noecc_ooblayout = { .ecc = spinand_noecc_ooblayout_ecc, - .rfree = spinand_noecc_ooblayout_free, + .free = spinand_noecc_ooblayout_free, }; static int spinand_init(struct spinand_device *spinand) diff --git a/drivers/mtd/nand/spi/gigadevice.c b/drivers/mtd/nand/spi/gigadevice.c index 0b228dcb5b..4c8bb1e12d 100644 --- a/drivers/mtd/nand/spi/gigadevice.c +++ b/drivers/mtd/nand/spi/gigadevice.c @@ -104,7 +104,7 @@ static int gd5fxgq4xexxg_ecc_get_status(struct spinand_device *spinand, static const struct mtd_ooblayout_ops gd5fxgq4xexxg_ooblayout = { .ecc = gd5fxgq4xexxg_ooblayout_ecc, - .rfree = gd5fxgq4xexxg_ooblayout_free, + .free = gd5fxgq4xexxg_ooblayout_free, }; static const struct spinand_info gigadevice_spinand_table[] = { diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c index 67d092be2c..2948e2ea41 100644 --- a/drivers/mtd/nand/spi/macronix.c +++ b/drivers/mtd/nand/spi/macronix.c @@ -48,7 +48,7 @@ static int mx35lfxge4ab_ooblayout_free(struct mtd_info *mtd, int section, static const struct mtd_ooblayout_ops mx35lfxge4ab_ooblayout = { .ecc = mx35lfxge4ab_ooblayout_ecc, - .rfree = mx35lfxge4ab_ooblayout_free, + .free = mx35lfxge4ab_ooblayout_free, }; static int mx35lf1ge4ab_get_eccsr(struct spinand_device *spinand, u8 *eccsr) diff --git a/drivers/mtd/nand/spi/micron.c b/drivers/mtd/nand/spi/micron.c index 687306e33e..718c4b42ca 100644 --- a/drivers/mtd/nand/spi/micron.c +++ b/drivers/mtd/nand/spi/micron.c @@ -64,7 +64,7 @@ static int mt29f2g01abagd_ooblayout_free(struct mtd_info *mtd, int section, static const struct mtd_ooblayout_ops mt29f2g01abagd_ooblayout = { .ecc = mt29f2g01abagd_ooblayout_ecc, - .rfree = mt29f2g01abagd_ooblayout_free, + .free = mt29f2g01abagd_ooblayout_free, }; static int mt29f2g01abagd_ecc_get_status(struct spinand_device *spinand, diff --git a/drivers/mtd/nand/spi/winbond.c b/drivers/mtd/nand/spi/winbond.c index 6ede98c85d..b05cd70457 100644 --- a/drivers/mtd/nand/spi/winbond.c +++ b/drivers/mtd/nand/spi/winbond.c @@ -60,7 +60,7 @@ static int w25m02gv_ooblayout_free(struct mtd_info *mtd, int section, static const struct mtd_ooblayout_ops w25m02gv_ooblayout = { .ecc = w25m02gv_ooblayout_ecc, - .rfree = w25m02gv_ooblayout_free, + .free = w25m02gv_ooblayout_free, }; static int w25m02gv_select_target(struct spinand_device *spinand, diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 1b9151714c..ceffd994de 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -129,8 +129,8 @@ struct mtd_oob_region { struct mtd_ooblayout_ops { int (*ecc)(struct mtd_info *mtd, int section, struct mtd_oob_region *oobecc); - int (*rfree)(struct mtd_info *mtd, int section, - struct mtd_oob_region *oobfree); + int (*free)(struct mtd_info *mtd, int section, + struct mtd_oob_region *oobfree); }; /*
This reverts commit 8d38a8459b0de45f5ff41f3e11c278a5cf395fd0. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com> --- drivers/mtd/mtdcore.c | 4 ++-- drivers/mtd/nand/raw/denali.c | 2 +- drivers/mtd/nand/spi/core.c | 2 +- drivers/mtd/nand/spi/gigadevice.c | 2 +- drivers/mtd/nand/spi/macronix.c | 2 +- drivers/mtd/nand/spi/micron.c | 2 +- drivers/mtd/nand/spi/winbond.c | 2 +- include/linux/mtd/mtd.h | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-)