linux-mtd.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mtd: meson: fix meson_nfc_dma_buffer_release() arguments
@ 2020-10-27 22:20 sa
  2020-10-28  8:12 ` Miquel Raynal
  0 siblings, 1 reply; 6+ messages in thread
From: sa @ 2020-10-27 22:20 UTC (permalink / raw)
  To: linux-mtd
  Cc: Sergei Antonov, Liang Yang, Yixun Lan, Jianxin Pan, Miquel Raynal

From: Sergei Antonov <saproj@gmail.com>

Arguments 'infolen' and 'datalen' to meson_nfc_dma_buffer_release() were mixed up.
Also extra spaces removed.

Signed-off-by: Sergei Antonov <saproj@gmail.com>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Liang Yang <liang.yang@amlogic.com>
Cc: Yixun Lan <yixun.lan@amlogic.com>
Cc: Jianxin Pan <jianxin.pan@amlogic.com>
---
 drivers/mtd/nand/raw/meson_nand.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
index 48e6dac96be6..578373a3d213 100644
--- a/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@ -246,7 +246,7 @@ static void meson_nfc_select_chip(struct nand_chip *nand, int chip)
 		value = (NFC_CLK_CYCLE - 1) | (meson_chip->bus_timing << 5);
 		writel(value, nfc->reg_base + NFC_REG_CFG);
 		writel((1 << 31), nfc->reg_base + NFC_REG_CMD);
-		nfc->bus_timing =  meson_chip->bus_timing;
+		nfc->bus_timing = meson_chip->bus_timing;
 	}
 }
 
@@ -510,7 +510,7 @@ static int meson_nfc_dma_buffer_setup(struct nand_chip *nand, void *databuf,
 }
 
 static void meson_nfc_dma_buffer_release(struct nand_chip *nand,
-					 int infolen, int datalen,
+					 int datalen, int infolen,
 					 enum dma_data_direction dir)
 {
 	struct meson_nfc *nfc = nand_get_controller_data(nand);
@@ -637,7 +637,7 @@ static int meson_nfc_write_page_sub(struct nand_chip *nand,
 
 	meson_nfc_select_chip(nand, nand->cur_cs);
 
-	data_len =  mtd->writesize + mtd->oobsize;
+	data_len = mtd->writesize + mtd->oobsize;
 	info_len = nand->ecc.steps * PER_INFO_BYTE;
 
 	ret = meson_nfc_rw_cmd_prepare_and_execute(nand, page, DIRWRITE);
@@ -721,7 +721,7 @@ static int meson_nfc_read_page_sub(struct nand_chip *nand,
 
 	meson_nfc_select_chip(nand, nand->cur_cs);
 
-	data_len =  mtd->writesize + mtd->oobsize;
+	data_len = mtd->writesize + mtd->oobsize;
 	info_len = nand->ecc.steps * PER_INFO_BYTE;
 
 	ret = meson_nfc_rw_cmd_prepare_and_execute(nand, page, DIRREAD);
@@ -792,7 +792,7 @@ static int meson_nfc_read_page_hwecc(struct nand_chip *nand, u8 *buf,
 			mtd->ecc_stats.failed++;
 			return bitflips;
 		}
-		ret  = meson_nfc_read_page_raw(nand, buf, 0, page);
+		ret = meson_nfc_read_page_raw(nand, buf, 0, page);
 		if (ret)
 			return ret;
 
@@ -810,7 +810,7 @@ static int meson_nfc_read_page_hwecc(struct nand_chip *nand, u8 *buf,
 				mtd->ecc_stats.failed++;
 			} else {
 				mtd->ecc_stats.corrected += ret;
-				bitflips =  max_t(u32, bitflips, ret);
+				bitflips = max_t(u32, bitflips, ret);
 			}
 		}
 	} else if (buf && buf != meson_chip->data_buf) {
@@ -960,7 +960,7 @@ static int meson_ooblayout_ecc(struct mtd_info *mtd, int section,
 	if (section >= nand->ecc.steps)
 		return -ERANGE;
 
-	oobregion->offset =  2 + (section * (2 + nand->ecc.bytes));
+	oobregion->offset = 2 + (section * (2 + nand->ecc.bytes));
 	oobregion->length = nand->ecc.bytes;
 
 	return 0;
@@ -1080,7 +1080,7 @@ static int meson_chip_buffer_init(struct nand_chip *nand)
 
 	nsectors = mtd->writesize / nand->ecc.size;
 
-	page_bytes =  mtd->writesize + mtd->oobsize;
+	page_bytes = mtd->writesize + mtd->oobsize;
 	info_bytes = nsectors * PER_INFO_BYTE;
 
 	meson_chip->data_buf = kmalloc(page_bytes, GFP_KERNEL);
@@ -1459,7 +1459,7 @@ static struct platform_driver meson_nfc_driver = {
 	.probe  = meson_nfc_probe,
 	.remove = meson_nfc_remove,
 	.driver = {
-		.name  = "meson-nand",
+		.name = "meson-nand",
 		.of_match_table = meson_nfc_id_table,
 	},
 };
-- 
2.17.1


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] mtd: meson: fix meson_nfc_dma_buffer_release() arguments
  2020-10-27 22:20 [PATCH] mtd: meson: fix meson_nfc_dma_buffer_release() arguments sa
@ 2020-10-28  8:12 ` Miquel Raynal
  0 siblings, 0 replies; 6+ messages in thread
From: Miquel Raynal @ 2020-10-28  8:12 UTC (permalink / raw)
  To: sa; +Cc: Yixun Lan, Liang Yang, linux-mtd, Jianxin Pan

Hello Sergei,

sa <saproj@gmail.com> wrote on Wed, 28 Oct 2020 01:20:15 +0300:

> From: Sergei Antonov <saproj@gmail.com>
> 
> Arguments 'infolen' and 'datalen' to meson_nfc_dma_buffer_release() were mixed up.
> Also extra spaces removed.

If this is true, then this is definitely a big fix that needs a Fixes:
tag as well as a Cc: stable tag. The other Cc: are not really needed in
the patch though, you just need to add these people when sending the
patch.

Also, please split this into two chunks. Backporting a fix with so much
extra changes is a pain:
- 1/2: fix the arguments
- 2/2: fix the extra spaces (no need for a Fixes/Stable tag here).

Thanks!
Miquèl

> Signed-off-by: Sergei Antonov <saproj@gmail.com>
> Cc: Miquel Raynal <miquel.raynal@bootlin.com>
> Cc: Liang Yang <liang.yang@amlogic.com>
> Cc: Yixun Lan <yixun.lan@amlogic.com>
> Cc: Jianxin Pan <jianxin.pan@amlogic.com>

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] mtd: meson: fix meson_nfc_dma_buffer_release() arguments
  2020-10-28  9:49 Sergei Antonov
  2020-10-28 10:03 ` Miquel Raynal
  2020-10-30  2:22 ` Liang Yang
@ 2020-10-30 17:27 ` Miquel Raynal
  2 siblings, 0 replies; 6+ messages in thread
From: Miquel Raynal @ 2020-10-30 17:27 UTC (permalink / raw)
  To: Sergei Antonov, linux-mtd; +Cc: liang.yang, jianxin.pan, stable, Miquel Raynal

On Wed, 2020-10-28 at 09:49:40 UTC, Sergei Antonov wrote:
> Arguments 'infolen' and 'datalen' to meson_nfc_dma_buffer_release() were mixed up.
> 
> Fixes: 8fae856c53500 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
> Cc: stable@vger.kernel.org
> Signed-off-by: Sergei Antonov <saproj@gmail.com>

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.

Miquel

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] mtd: meson: fix meson_nfc_dma_buffer_release() arguments
  2020-10-28  9:49 Sergei Antonov
  2020-10-28 10:03 ` Miquel Raynal
@ 2020-10-30  2:22 ` Liang Yang
  2020-10-30 17:27 ` Miquel Raynal
  2 siblings, 0 replies; 6+ messages in thread
From: Liang Yang @ 2020-10-30  2:22 UTC (permalink / raw)
  To: Sergei Antonov, linux-mtd; +Cc: stable, jianxin.pan, miquel.raynal

Hi Sergei, miquel

On 2020/10/28 17:49, Sergei Antonov wrote:
> Arguments 'infolen' and 'datalen' to meson_nfc_dma_buffer_release() were mixed up.
>
> Fixes: 8fae856c53500 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
> Cc: stable@vger.kernel.org
> Signed-off-by: Sergei Antonov <saproj@gmail.com>
> ---
>   drivers/mtd/nand/raw/meson_nand.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
> index 48e6dac96be6..a76afea6ea77 100644
> --- a/drivers/mtd/nand/raw/meson_nand.c
> +++ b/drivers/mtd/nand/raw/meson_nand.c
> @@ -510,7 +510,7 @@ static int meson_nfc_dma_buffer_setup(struct nand_chip *nand, void *databuf,
>   }
>   
>   static void meson_nfc_dma_buffer_release(struct nand_chip *nand,
> -					 int infolen, int datalen,
> +					 int datalen, int infolen,
>   					 enum dma_data_direction dir)
>   {
>   	struct meson_nfc *nfc = nand_get_controller_data(nand);
It is good to me:

Acked-by: Liang Yang <liang.yang@amlogic.com>

and thanks.


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] mtd: meson: fix meson_nfc_dma_buffer_release() arguments
  2020-10-28  9:49 Sergei Antonov
@ 2020-10-28 10:03 ` Miquel Raynal
  2020-10-30  2:22 ` Liang Yang
  2020-10-30 17:27 ` Miquel Raynal
  2 siblings, 0 replies; 6+ messages in thread
From: Miquel Raynal @ 2020-10-28 10:03 UTC (permalink / raw)
  To: Sergei Antonov; +Cc: liang.yang, linux-mtd, stable, jianxin.pan

Hi Sergei,

Sergei Antonov <saproj@gmail.com> wrote on Wed, 28 Oct 2020 12:49:40
+0300:

> Arguments 'infolen' and 'datalen' to meson_nfc_dma_buffer_release() were mixed up.
> 
> Fixes: 8fae856c53500 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
> Cc: stable@vger.kernel.org
> Signed-off-by: Sergei Antonov <saproj@gmail.com>

This patch looks good to me. Next time you send a new iteration of a
patch, please use [PATCH v2] in the subject prefix and also add a
changelog below the three dashes.

(your other patch to fix the style is still welcome)

> ---
>  drivers/mtd/nand/raw/meson_nand.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
> index 48e6dac96be6..a76afea6ea77 100644
> --- a/drivers/mtd/nand/raw/meson_nand.c
> +++ b/drivers/mtd/nand/raw/meson_nand.c
> @@ -510,7 +510,7 @@ static int meson_nfc_dma_buffer_setup(struct nand_chip *nand, void *databuf,
>  }
>  
>  static void meson_nfc_dma_buffer_release(struct nand_chip *nand,
> -					 int infolen, int datalen,
> +					 int datalen, int infolen,
>  					 enum dma_data_direction dir)
>  {
>  	struct meson_nfc *nfc = nand_get_controller_data(nand);

Thanks,
Miquèl

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH] mtd: meson: fix meson_nfc_dma_buffer_release() arguments
@ 2020-10-28  9:49 Sergei Antonov
  2020-10-28 10:03 ` Miquel Raynal
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Sergei Antonov @ 2020-10-28  9:49 UTC (permalink / raw)
  To: linux-mtd; +Cc: liang.yang, stable, jianxin.pan, miquel.raynal

Arguments 'infolen' and 'datalen' to meson_nfc_dma_buffer_release() were mixed up.

Fixes: 8fae856c53500 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
Cc: stable@vger.kernel.org
Signed-off-by: Sergei Antonov <saproj@gmail.com>
---
 drivers/mtd/nand/raw/meson_nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
index 48e6dac96be6..a76afea6ea77 100644
--- a/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@ -510,7 +510,7 @@ static int meson_nfc_dma_buffer_setup(struct nand_chip *nand, void *databuf,
 }
 
 static void meson_nfc_dma_buffer_release(struct nand_chip *nand,
-					 int infolen, int datalen,
+					 int datalen, int infolen,
 					 enum dma_data_direction dir)
 {
 	struct meson_nfc *nfc = nand_get_controller_data(nand);
-- 
2.17.1


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-30 17:27 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-27 22:20 [PATCH] mtd: meson: fix meson_nfc_dma_buffer_release() arguments sa
2020-10-28  8:12 ` Miquel Raynal
2020-10-28  9:49 Sergei Antonov
2020-10-28 10:03 ` Miquel Raynal
2020-10-30  2:22 ` Liang Yang
2020-10-30 17:27 ` Miquel Raynal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).