[PATCH 4/5] mtd: pxa3xx_nand: remove dead code

2020-10-28 Thread Baruch Siach
The kfree() call is unreachable, and is not needed. Remove this call and
the fail_disable_clk label.

Reviewed-by: Stefan Roese 
Signed-off-by: Baruch Siach 
---
 drivers/mtd/nand/raw/pxa3xx_nand.c | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c 
b/drivers/mtd/nand/raw/pxa3xx_nand.c
index c9b7a4251b4e..8481c6e3bf91 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -1768,7 +1768,7 @@ static int alloc_nand_resource(struct pxa3xx_nand_info 
*info)
struct pxa3xx_nand_host *host;
struct nand_chip *chip = NULL;
struct mtd_info *mtd;
-   int ret, cs;
+   int cs;
 
pdata = info->pdata;
if (pdata->num_cs <= 0)
@@ -1804,19 +1804,13 @@ static int alloc_nand_resource(struct pxa3xx_nand_info 
*info)
/* Allocate a buffer to allow flash detection */
info->buf_size = INIT_BUFFER_SIZE;
info->data_buff = kmalloc(info->buf_size, GFP_KERNEL);
-   if (info->data_buff == NULL) {
-   ret = -ENOMEM;
-   goto fail_disable_clk;
-   }
+   if (info->data_buff == NULL)
+   return -ENOMEM;
 
/* initialize all interrupts to be disabled */
disable_int(info, NDSR_MASK);
 
return 0;
-
-   kfree(info->data_buff);
-fail_disable_clk:
-   return ret;
 }
 
 static int pxa3xx_nand_probe_dt(struct udevice *dev, struct pxa3xx_nand_info 
*info)
-- 
2.28.0



[PATCH 4/5] mtd: pxa3xx_nand: remove dead code

2020-09-15 Thread Baruch Siach
The kfree() call is unreachable, and is not needed. Remove this call and
the fail_disable_clk label.

Signed-off-by: Baruch Siach 
---
 drivers/mtd/nand/raw/pxa3xx_nand.c | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c 
b/drivers/mtd/nand/raw/pxa3xx_nand.c
index d455201b91a3..54ba65fa8202 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -1769,7 +1769,7 @@ static int alloc_nand_resource(struct pxa3xx_nand_info 
*info)
struct pxa3xx_nand_host *host;
struct nand_chip *chip = NULL;
struct mtd_info *mtd;
-   int ret, cs;
+   int cs;
 
pdata = info->pdata;
if (pdata->num_cs <= 0)
@@ -1805,19 +1805,13 @@ static int alloc_nand_resource(struct pxa3xx_nand_info 
*info)
/* Allocate a buffer to allow flash detection */
info->buf_size = INIT_BUFFER_SIZE;
info->data_buff = kmalloc(info->buf_size, GFP_KERNEL);
-   if (info->data_buff == NULL) {
-   ret = -ENOMEM;
-   goto fail_disable_clk;
-   }
+   if (info->data_buff == NULL)
+   return -ENOMEM;
 
/* initialize all interrupts to be disabled */
disable_int(info, NDSR_MASK);
 
return 0;
-
-   kfree(info->data_buff);
-fail_disable_clk:
-   return ret;
 }
 
 static int pxa3xx_nand_probe_dt(struct udevice *dev, struct pxa3xx_nand_info 
*info)
-- 
2.28.0