Hi Boris, Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx> wrote on Sun, 19 Apr 2020 14:51:40 +0200: > Now that we have a single we can move it to the directory where all > single source file drivers live. > > Signed-off-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx> > --- > drivers/mtd/nand/raw/Makefile | 1 + > drivers/mtd/nand/raw/{bcm47xxnflash => }/bcm47xxnflash.c | 0 > drivers/mtd/nand/raw/bcm47xxnflash/Makefile | 2 -- > 3 files changed, 1 insertion(+), 2 deletions(-) > rename drivers/mtd/nand/raw/{bcm47xxnflash => }/bcm47xxnflash.c (100%) > delete mode 100644 drivers/mtd/nand/raw/bcm47xxnflash/Makefile Here are two independent comments: 1/ I think calling the file bcm47xxn-nand-controller.c would best fit todays policy. 2/ I am not sure there is an interest in doing the merge + move/rename in separate steps. It's always a pain to follow changes in a file with git blame when code get's moved around so I would prefer doing this in a single change, what do you think? > > diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile > index 2d136b158fb7..703d696c2d61 100644 > --- a/drivers/mtd/nand/raw/Makefile > +++ b/drivers/mtd/nand/raw/Makefile > @@ -58,6 +58,7 @@ obj-$(CONFIG_MTD_NAND_TEGRA) += tegra_nand.o > obj-$(CONFIG_MTD_NAND_STM32_FMC2) += stm32_fmc2_nand.o > obj-$(CONFIG_MTD_NAND_MESON) += meson_nand.o > obj-$(CONFIG_MTD_NAND_CADENCE) += cadence-nand-controller.o > +obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH) += bcm47xxnflash.o > > nand-objs := nand_base.o nand_legacy.o nand_bbt.o nand_timings.o nand_ids.o > nand-objs += nand_onfi.o > diff --git a/drivers/mtd/nand/raw/bcm47xxnflash/bcm47xxnflash.c b/drivers/mtd/nand/raw/bcm47xxnflash.c > similarity index 100% > rename from drivers/mtd/nand/raw/bcm47xxnflash/bcm47xxnflash.c > rename to drivers/mtd/nand/raw/bcm47xxnflash.c > diff --git a/drivers/mtd/nand/raw/bcm47xxnflash/Makefile b/drivers/mtd/nand/raw/bcm47xxnflash/Makefile > deleted file mode 100644 > index 71a953078799..000000000000 > --- a/drivers/mtd/nand/raw/bcm47xxnflash/Makefile > +++ /dev/null > @@ -1,2 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0-only > -obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH) += bcm47xxnflash.o Thanks, Miquèl ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/