Message ID | 20200419125140.1307309-10-boris.brezillon@collabora.com |
---|---|
State | Changes Requested |
Delegated to: | Miquel Raynal |
Headers | show |
Series | mtd: rawnand: bcm47xx: Convert the driver exec_op() | expand |
On Sun, 19 Apr 2020 14:51:40 +0200 Boris Brezillon <boris.brezillon@collabora.com> wrote: > 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@collabora.com> > --- > 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 > > 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 I forgot to remove the obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH) += bcm47xxnflash/ line. Will fix it in v2. > > 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
Hi Boris, Boris Brezillon <boris.brezillon@collabora.com> 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@collabora.com> > --- > 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
On Mon, 27 Apr 2020 19:24:17 +0200 Miquel Raynal <miquel.raynal@bootlin.com> wrote: > Hi Boris, > > Boris Brezillon <boris.brezillon@collabora.com> 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@collabora.com> > > --- > > 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. Sure I can do that. > > 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? Great minds think alike: I was planning to merge those 2 patches in v2 ;-). It's indeed not necessary to do it in 2 steps.
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
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@collabora.com> --- 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