* [PATCH 1/2] mtd: onenand: Get rid of comments giving the file path inside the file itself
@ 2018-02-18 16:05 Boris Brezillon
2018-02-18 16:05 ` [PATCH 2/2] mtd: Move onenand code base to drivers/mtd/nand/onenand Boris Brezillon
2018-03-18 21:12 ` [PATCH 1/2] mtd: onenand: Get rid of comments giving the file path inside the file itself Boris Brezillon
0 siblings, 2 replies; 3+ messages in thread
From: Boris Brezillon @ 2018-02-18 16:05 UTC (permalink / raw)
To: Boris Brezillon, Richard Weinberger, linux-mtd, Kyungmin Park
Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen
Some files add a comment giving the path of the file inside the Linux
tree, which is pretty useless since the reader had to find the file to
open it.
Getting rid of these comments will also allow us to easily move these
files around when needed.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
drivers/mtd/onenand/generic.c | 2 --
drivers/mtd/onenand/omap2.c | 2 --
drivers/mtd/onenand/onenand_base.c | 2 --
drivers/mtd/onenand/onenand_bbt.c | 2 --
4 files changed, 8 deletions(-)
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c
index 125da34d8ff9..d5ccaf943b91 100644
--- a/drivers/mtd/onenand/generic.c
+++ b/drivers/mtd/onenand/generic.c
@@ -1,6 +1,4 @@
/*
- * linux/drivers/mtd/onenand/generic.c
- *
* Copyright (c) 2005 Samsung Electronics
* Kyungmin Park <kyungmin.park@samsung.com>
*
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 87c34f607a75..9c159f0dd9a6 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -1,6 +1,4 @@
/*
- * linux/drivers/mtd/onenand/omap2.c
- *
* OneNAND driver for OMAP2 / OMAP3
*
* Copyright © 2005-2006 Nokia Corporation
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 979f4031f23c..05907b1b4098 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1,6 +1,4 @@
/*
- * linux/drivers/mtd/onenand/onenand_base.c
- *
* Copyright © 2005-2009 Samsung Electronics
* Copyright © 2007 Nokia Corporation
*
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index 420260c25ca0..dde20487937d 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * linux/drivers/mtd/onenand/onenand_bbt.c
- *
* Bad Block Table support for the OneNAND driver
*
* Copyright(c) 2005 Samsung Electronics
--
2.14.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] mtd: Move onenand code base to drivers/mtd/nand/onenand
2018-02-18 16:05 [PATCH 1/2] mtd: onenand: Get rid of comments giving the file path inside the file itself Boris Brezillon
@ 2018-02-18 16:05 ` Boris Brezillon
2018-03-18 21:12 ` [PATCH 1/2] mtd: onenand: Get rid of comments giving the file path inside the file itself Boris Brezillon
1 sibling, 0 replies; 3+ messages in thread
From: Boris Brezillon @ 2018-02-18 16:05 UTC (permalink / raw)
To: Boris Brezillon, Richard Weinberger, linux-mtd, Kyungmin Park
Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen
Move onenand code base to the drivers/mtd/nand directory in the hope
that someday someone will patch it to use the generic NAND helpers.
If it never happens, at least we'll have all NAND related support in a
single directory and not spread over the drivers/mtd/ directory.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
MAINTAINERS | 2 +-
drivers/mtd/Kconfig | 2 --
drivers/mtd/Makefile | 2 +-
drivers/mtd/nand/Kconfig | 2 ++
drivers/mtd/nand/Makefile | 1 +
drivers/mtd/{ => nand}/onenand/Kconfig | 0
drivers/mtd/{ => nand}/onenand/Makefile | 0
drivers/mtd/{ => nand}/onenand/generic.c | 0
drivers/mtd/{ => nand}/onenand/omap2.c | 0
drivers/mtd/{ => nand}/onenand/onenand_base.c | 0
drivers/mtd/{ => nand}/onenand/onenand_bbt.c | 0
drivers/mtd/{ => nand}/onenand/samsung.c | 0
drivers/mtd/{ => nand}/onenand/samsung.h | 0
13 files changed, 5 insertions(+), 4 deletions(-)
rename drivers/mtd/{ => nand}/onenand/Kconfig (100%)
rename drivers/mtd/{ => nand}/onenand/Makefile (100%)
rename drivers/mtd/{ => nand}/onenand/generic.c (100%)
rename drivers/mtd/{ => nand}/onenand/omap2.c (100%)
rename drivers/mtd/{ => nand}/onenand/onenand_base.c (100%)
rename drivers/mtd/{ => nand}/onenand/onenand_bbt.c (100%)
rename drivers/mtd/{ => nand}/onenand/samsung.c (100%)
rename drivers/mtd/{ => nand}/onenand/samsung.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 34b2e9ed6d3d..82678c855d3b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10206,7 +10206,7 @@ ONENAND FLASH DRIVER
M: Kyungmin Park <kyungmin.park@samsung.com>
L: linux-mtd@lists.infradead.org
S: Maintained
-F: drivers/mtd/onenand/
+F: drivers/mtd/nand/onenand/
F: include/linux/mtd/onenand*.h
ONSTREAM SCSI TAPE DRIVER
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 2a8ac6829d42..46ab7feec6b6 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -333,8 +333,6 @@ source "drivers/mtd/devices/Kconfig"
source "drivers/mtd/nand/Kconfig"
-source "drivers/mtd/onenand/Kconfig"
-
source "drivers/mtd/lpddr/Kconfig"
source "drivers/mtd/spi-nor/Kconfig"
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index d6f8f625e1ff..93473d215a38 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -32,7 +32,7 @@ obj-$(CONFIG_MTD_SWAP) += mtdswap.o
nftl-objs := nftlcore.o nftlmount.o
inftl-objs := inftlcore.o inftlmount.o
-obj-y += chips/ lpddr/ maps/ devices/ nand/ onenand/ tests/
+obj-y += chips/ lpddr/ maps/ devices/ nand/ tests/
obj-$(CONFIG_MTD_SPI_NOR) += spi-nor/
obj-$(CONFIG_MTD_UBI) += ubi/
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 1c1a1f487e20..88c7d3b4ff8b 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -1,4 +1,6 @@
config MTD_NAND_CORE
tristate
+source "drivers/mtd/nand/onenand/Kconfig"
+
source "drivers/mtd/nand/raw/Kconfig"
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index a72d3cb0f325..3f0cb87f1a57 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -3,4 +3,5 @@
nandcore-objs := core.o bbt.o
obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o
+obj-y += onenand/
obj-y += raw/
diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/nand/onenand/Kconfig
similarity index 100%
rename from drivers/mtd/onenand/Kconfig
rename to drivers/mtd/nand/onenand/Kconfig
diff --git a/drivers/mtd/onenand/Makefile b/drivers/mtd/nand/onenand/Makefile
similarity index 100%
rename from drivers/mtd/onenand/Makefile
rename to drivers/mtd/nand/onenand/Makefile
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/nand/onenand/generic.c
similarity index 100%
rename from drivers/mtd/onenand/generic.c
rename to drivers/mtd/nand/onenand/generic.c
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/nand/onenand/omap2.c
similarity index 100%
rename from drivers/mtd/onenand/omap2.c
rename to drivers/mtd/nand/onenand/omap2.c
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/nand/onenand/onenand_base.c
similarity index 100%
rename from drivers/mtd/onenand/onenand_base.c
rename to drivers/mtd/nand/onenand/onenand_base.c
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/nand/onenand/onenand_bbt.c
similarity index 100%
rename from drivers/mtd/onenand/onenand_bbt.c
rename to drivers/mtd/nand/onenand/onenand_bbt.c
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/nand/onenand/samsung.c
similarity index 100%
rename from drivers/mtd/onenand/samsung.c
rename to drivers/mtd/nand/onenand/samsung.c
diff --git a/drivers/mtd/onenand/samsung.h b/drivers/mtd/nand/onenand/samsung.h
similarity index 100%
rename from drivers/mtd/onenand/samsung.h
rename to drivers/mtd/nand/onenand/samsung.h
--
2.14.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] mtd: onenand: Get rid of comments giving the file path inside the file itself
2018-02-18 16:05 [PATCH 1/2] mtd: onenand: Get rid of comments giving the file path inside the file itself Boris Brezillon
2018-02-18 16:05 ` [PATCH 2/2] mtd: Move onenand code base to drivers/mtd/nand/onenand Boris Brezillon
@ 2018-03-18 21:12 ` Boris Brezillon
1 sibling, 0 replies; 3+ messages in thread
From: Boris Brezillon @ 2018-03-18 21:12 UTC (permalink / raw)
To: Boris Brezillon, Richard Weinberger, linux-mtd, Kyungmin Park
Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen
On Sun, 18 Feb 2018 17:05:15 +0100
Boris Brezillon <boris.brezillon@bootlin.com> wrote:
> Some files add a comment giving the path of the file inside the Linux
> tree, which is pretty useless since the reader had to find the file to
> open it.
>
> Getting rid of these comments will also allow us to easily move these
> files around when needed.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Queued both patches to nand/next.
> ---
> drivers/mtd/onenand/generic.c | 2 --
> drivers/mtd/onenand/omap2.c | 2 --
> drivers/mtd/onenand/onenand_base.c | 2 --
> drivers/mtd/onenand/onenand_bbt.c | 2 --
> 4 files changed, 8 deletions(-)
>
> diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c
> index 125da34d8ff9..d5ccaf943b91 100644
> --- a/drivers/mtd/onenand/generic.c
> +++ b/drivers/mtd/onenand/generic.c
> @@ -1,6 +1,4 @@
> /*
> - * linux/drivers/mtd/onenand/generic.c
> - *
> * Copyright (c) 2005 Samsung Electronics
> * Kyungmin Park <kyungmin.park@samsung.com>
> *
> diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
> index 87c34f607a75..9c159f0dd9a6 100644
> --- a/drivers/mtd/onenand/omap2.c
> +++ b/drivers/mtd/onenand/omap2.c
> @@ -1,6 +1,4 @@
> /*
> - * linux/drivers/mtd/onenand/omap2.c
> - *
> * OneNAND driver for OMAP2 / OMAP3
> *
> * Copyright © 2005-2006 Nokia Corporation
> diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
> index 979f4031f23c..05907b1b4098 100644
> --- a/drivers/mtd/onenand/onenand_base.c
> +++ b/drivers/mtd/onenand/onenand_base.c
> @@ -1,6 +1,4 @@
> /*
> - * linux/drivers/mtd/onenand/onenand_base.c
> - *
> * Copyright © 2005-2009 Samsung Electronics
> * Copyright © 2007 Nokia Corporation
> *
> diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
> index 420260c25ca0..dde20487937d 100644
> --- a/drivers/mtd/onenand/onenand_bbt.c
> +++ b/drivers/mtd/onenand/onenand_bbt.c
> @@ -1,7 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0
> /*
> - * linux/drivers/mtd/onenand/onenand_bbt.c
> - *
> * Bad Block Table support for the OneNAND driver
> *
> * Copyright(c) 2005 Samsung Electronics
--
Boris Brezillon, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-18 21:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-18 16:05 [PATCH 1/2] mtd: onenand: Get rid of comments giving the file path inside the file itself Boris Brezillon
2018-02-18 16:05 ` [PATCH 2/2] mtd: Move onenand code base to drivers/mtd/nand/onenand Boris Brezillon
2018-03-18 21:12 ` [PATCH 1/2] mtd: onenand: Get rid of comments giving the file path inside the file itself Boris Brezillon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox