mtd: nand: gpmi: replace _manual_ swap with swap macro

Message ID 20171103203147.GA28309@embeddedor.com
State New
Delegated to: Boris Brezillon
Headers show
Series
  • mtd: nand: gpmi: replace _manual_ swap with swap macro
Related show

Commit Message

Gustavo A. R. Silva Nov. 3, 2017, 8:31 p.m.
Make use of the swap macro and remove unnecessary variables swap.
This makes the code easier to read and maintain.

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
---
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

Comments

Gustavo A. R. Silva Nov. 3, 2017, 9:44 p.m. | #1
Quoting Han Xu <han.xu@nxp.com>:

> ________________________________________
> From: Gustavo A. R. Silva <garsilva@embeddedor.com>
> Sent: Friday, November 3, 2017 3:31 PM
> To: Han Xu; Boris Brezillon; Richard Weinberger; David Woodhouse;  
> Brian Norris; Marek Vasut; Cyrille Pitchen
> Cc: linux-mtd@lists.infradead.org; linux-kernel@vger.kernel.org;  
> Gustavo A. R. Silva
> Subject: [PATCH] mtd: nand: gpmi: replace _manual_ swap with swap macro
>
> Make use of the swap macro and remove unnecessary variables swap.
> This makes the code easier to read and maintain.
>
> This code was detected with the help of Coccinelle.
>
> Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
> ---
>  drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 16 ++++------------
>  1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c  
> b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index 50f8d4a..9e365d4 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -1487,12 +1487,8 @@ static int gpmi_ecc_read_page_raw(struct  
> mtd_info *mtd,
>          * See the layout description for a detailed explanation on why this
>          * is needed.
>          */
> -       if (this->swap_block_mark) {
> -               u8 swap = tmp_buf[0];
> -
> -               tmp_buf[0] = tmp_buf[mtd->writesize];
> -               tmp_buf[mtd->writesize] = swap;
> -       }
> +       if (this->swap_block_mark)
> +               swap(tmp_buf[0], tmp_buf[mtd->writesize]);
>
>         /*
>          * Copy the metadata section into the oob buffer (this section is
> @@ -1615,12 +1611,8 @@ static int gpmi_ecc_write_page_raw(struct  
> mtd_info *mtd,
>          * See the layout description for a detailed explanation on why this
>          * is needed.
>          */
> -       if (this->swap_block_mark) {
> -               u8 swap = tmp_buf[0];
> -
> -               tmp_buf[0] = tmp_buf[mtd->writesize];
> -               tmp_buf[mtd->writesize] = swap;
> -       }
> +       if (this->swap_block_mark)
> +               swap(tmp_buf[0], tmp_buf[mtd->writesize]);
>
>         chip->write_buf(mtd, tmp_buf, mtd->writesize + mtd->oobsize);
>
> Acked-by: Han Xu <han.xu@nxp.com>
>

Thank you, Han.
--
Gustavo A. R. Silva

Patch

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 50f8d4a..9e365d4 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -1487,12 +1487,8 @@  static int gpmi_ecc_read_page_raw(struct mtd_info *mtd,
 	 * See the layout description for a detailed explanation on why this
 	 * is needed.
 	 */
-	if (this->swap_block_mark) {
-		u8 swap = tmp_buf[0];
-
-		tmp_buf[0] = tmp_buf[mtd->writesize];
-		tmp_buf[mtd->writesize] = swap;
-	}
+	if (this->swap_block_mark)
+		swap(tmp_buf[0], tmp_buf[mtd->writesize]);
 
 	/*
 	 * Copy the metadata section into the oob buffer (this section is
@@ -1615,12 +1611,8 @@  static int gpmi_ecc_write_page_raw(struct mtd_info *mtd,
 	 * See the layout description for a detailed explanation on why this
 	 * is needed.
 	 */
-	if (this->swap_block_mark) {
-		u8 swap = tmp_buf[0];
-
-		tmp_buf[0] = tmp_buf[mtd->writesize];
-		tmp_buf[mtd->writesize] = swap;
-	}
+	if (this->swap_block_mark)
+		swap(tmp_buf[0], tmp_buf[mtd->writesize]);
 
 	chip->write_buf(mtd, tmp_buf, mtd->writesize + mtd->oobsize);