imx/gpmi: Make debug prints more clear

PATCH Applied Vikram Narayanan 3 participants 4 messages Sep 23, 2012 – Oct 10, 2012

Subsystems (2)

Memory technology devices (MTD) NAND flash

lore

Share & tools

lore

Vikram Narayanan

author

2012-09-23 09:49 UTC #0 lore raw

PATCH 1/1 imx/gpmi: Make debug prints more clear

Make the error messages more debugging friendly

Signed-off-by Vikram Narayanan <[email protected]>

Cc Huang Shijie <[email protected]>

---
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

drivers/mtd/nand/gpmi-nand/gpmi-nand.c +8 -6

index 5999b15..24fbfb8 100644
@@ -222,7 +222,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
 
 		ret = dma_map_sg(this->dev, sgl, 1, dr);
 		if (ret == 0)
-			pr_err("map failed.\n");
+			pr_err("DMA mapping failed.\n");
 
 		this->direct_dma_map_ok = false;
 	}

@@ -456,7 +456,7 @@ static int __devinit acquire_dma_channels(struct gpmi_nand_data *this)
 
 	dma_chan = dma_request_channel(mask, gpmi_dma_filter, this);
 	if (!dma_chan) {
-		pr_err("dma_request_channel failed.\n");
+		pr_err("Failed to request DMA channel.\n");
 		goto acquire_err;
 	}

@@ -630,7 +630,8 @@ static int read_page_prepare(struct gpmi_nand_data *this,
 						length, DMA_FROM_DEVICE);
 		if (dma_mapping_error(dev, dest_phys)) {
 			if (alt_size < length) {
-				pr_err("Alternate buffer is too small\n");
+				pr_err("%s, Alternate buffer is too small\n",
+					__func__);
 				return -ENOMEM;
 			}
 			goto map_failed;

@@ -680,7 +681,8 @@ static int send_page_prepare(struct gpmi_nand_data *this,
 						DMA_TO_DEVICE);
 		if (dma_mapping_error(dev, source_phys)) {
 			if (alt_size < length) {
-				pr_err("Alternate buffer is too small\n");
+				pr_err("%s, Alternate buffer is too small\n",
+					__func__);
 				return -ENOMEM;
 			}
 			goto map_failed;

@@ -768,7 +770,7 @@ static int gpmi_alloc_dma_buffer(struct gpmi_nand_data *this)
 
 error_alloc:
 	gpmi_free_dma_buffer(this);
-	pr_err("allocate DMA buffer ret!!\n");
+	pr_err("Error allocating DMA buffers!\n");
 	return -ENOMEM;
 }

@@ -1479,7 +1481,7 @@ static int gpmi_set_geometry(struct gpmi_nand_data *this)
 	/* Set up the NFC geometry which is used by BCH. */
 	ret = bch_set_geometry(this);
 	if (ret) {
-		pr_err("set geometry ret : %d\n", ret);
+		pr_err("Error setting BCH geometry : %d\n", ret);
 		return ret;
 	}

Signature · 1 line

1.7.4.1

Vikram Narayanan

author

2012-10-08 16:58 UTC #1 lore raw

Hello Huang,

Can you please give an ACK for this?

Thanks,
Vikram

Quoted 68 lines · Vikram Narayanan

Make the error messages more debugging friendly

Signed-off-by Vikram Narayanan<[email protected]>

Cc Huang Shijie<[email protected]>

---
  drivers/mtd/nand/gpmi-nand/gpmi-nand.c |   14 ++++++++------
  1 files changed, 8 insertions(+), 6 deletions(-)

drivers/mtd/nand/gpmi-nand/gpmi-nand.c +8 -6

index 5999b15..24fbfb8 100644
@@ -222,7 +222,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
 
  		ret = dma_map_sg(this->dev, sgl, 1, dr);
  		if (ret == 0)
-			pr_err("map failed.\n");
+			pr_err("DMA mapping failed.\n");
 
  		this->direct_dma_map_ok = false;
  	}

@@ -456,7 +456,7 @@ static int __devinit acquire_dma_channels(struct gpmi_nand_data *this)
 
  	dma_chan = dma_request_channel(mask, gpmi_dma_filter, this);
  	if (!dma_chan) {
-		pr_err("dma_request_channel failed.\n");
+		pr_err("Failed to request DMA channel.\n");
  		goto acquire_err;
  	}

@@ -630,7 +630,8 @@ static int read_page_prepare(struct gpmi_nand_data *this,
  						length, DMA_FROM_DEVICE);
  		if (dma_mapping_error(dev, dest_phys)) {
  			if (alt_size<  length) {
-				pr_err("Alternate buffer is too small\n");
+				pr_err("%s, Alternate buffer is too small\n",
+					__func__);
  				return -ENOMEM;
  			}
  			goto map_failed;

@@ -680,7 +681,8 @@ static int send_page_prepare(struct gpmi_nand_data *this,
  						DMA_TO_DEVICE);
  		if (dma_mapping_error(dev, source_phys)) {
  			if (alt_size<  length) {
-				pr_err("Alternate buffer is too small\n");
+				pr_err("%s, Alternate buffer is too small\n",
+					__func__);
  				return -ENOMEM;
  			}
  			goto map_failed;

@@ -768,7 +770,7 @@ static int gpmi_alloc_dma_buffer(struct gpmi_nand_data *this)
 
  error_alloc:
  	gpmi_free_dma_buffer(this);
-	pr_err("allocate DMA buffer ret!!\n");
+	pr_err("Error allocating DMA buffers!\n");
  	return -ENOMEM;
  }

@@ -1479,7 +1481,7 @@ static int gpmi_set_geometry(struct gpmi_nand_data *this)
  	/* Set up the NFC geometry which is used by BCH. */
  	ret = bch_set_geometry(this);
  	if (ret) {
-		pr_err("set geometry ret : %d\n", ret);
+		pr_err("Error setting BCH geometry : %d\n", ret);
  		return ret;
  	}

Huang Shijie

Acked-by

2012-10-09 01:41 UTC #2 lore raw

Quoted 72 lines · Vikram Narayanan

Hello Huang,

Can you please give an ACK for this?

Thanks,
Vikram

Quoted 64 lines · Vikram Narayanan

Make the error messages more debugging friendly

Signed-off-by Vikram Narayanan<[email protected]>

Cc Huang Shijie<[email protected]>

---
drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 14 ++++++++------

1 files changed, 8 insertions(+), 6 deletions(-)

drivers/mtd/nand/gpmi-nand/gpmi-nand.c +1 -1

index 5999b15..24fbfb8 100644
@@ -222,7 +222,7 @@ void prepare_data_dma(struct gpmi_nand_data 
 *this, enum dma_data_direction dr)
 
 ret = dma_map_sg(this->dev, sgl, 1, dr);
 if (ret == 0)
- pr_err("map failed.\n");
+ pr_err("DMA mapping failed.\n");
 
 this->direct_dma_map_ok = false;

}

drivers/mtd/nand/gpmi-nand/gpmi-nand.c +3 -2

@@ -456,7 +456,7 @@ static int __devinit acquire_dma_channels(struct 
 gpmi_nand_data *this)
 
 dma_chan = dma_request_channel(mask, gpmi_dma_filter, this);
 if (!dma_chan) {
- pr_err("dma_request_channel failed.\n");
+ pr_err("Failed to request DMA channel.\n");
 goto acquire_err;
 }

@@ -630,7 +630,8 @@ static int read_page_prepare(struct 
 gpmi_nand_data *this,
 length, DMA_FROM_DEVICE);
 if (dma_mapping_error(dev, dest_phys)) {
 if (alt_size< length) {
- pr_err("Alternate buffer is too small\n");
+ pr_err("%s, Alternate buffer is too small\n",
+ __func__);
 return -ENOMEM;
 }

goto map_failed;

drivers/mtd/nand/gpmi-nand/gpmi-nand.c +2 -1

@@ -680,7 +681,8 @@ static int send_page_prepare(struct 
 gpmi_nand_data *this,
 DMA_TO_DEVICE);
 if (dma_mapping_error(dev, source_phys)) {
 if (alt_size< length) {
- pr_err("Alternate buffer is too small\n");
+ pr_err("%s, Alternate buffer is too small\n",
+ __func__);
 return -ENOMEM;
 }

goto map_failed;

drivers/mtd/nand/gpmi-nand/gpmi-nand.c +0 -0

@@ -768,7 +770,7 @@ static int gpmi_alloc_dma_buffer(struct 
 gpmi_nand_data *this)

error_alloc:
gpmi_free_dma_buffer(this);
- pr_err("allocate DMA buffer ret!!\n");
+ pr_err("Error allocating DMA buffers!\n");
return -ENOMEM;
}

Quoted 12 lines

drivers/mtd/nand/gpmi-nand/gpmi-nand.c static int gpmi_set_geometry(struct · line 1487

Quoted 10 lines

drivers/mtd/nand/gpmi-nand/gpmi-nand.c +1 -1

@@ -1479,7 +1481,7 @@ static int gpmi_set_geometry(struct 
 gpmi_nand_data *this)
 /* Set up the NFC geometry which is used by BCH. */
 ret = bch_set_geometry(this);
 if (ret) {
- pr_err("set geometry ret : %d\n", ret);
+ pr_err("Error setting BCH geometry : %d\n", ret);
 return ret;
 }

thanks.

Acked-by Huang Shijie <[email protected]>

Artem Bityutskiy

Applied

2012-10-10 12:48 UTC #3 lore raw

In reply to Vikram Narayanan

Quoted 4 lines · Vikram Narayanan

Make the error messages more debugging friendly
Signed-off-by Vikram Narayanan <[email protected]>
Cc Huang Shijie <[email protected]>

Pushed to l2-mtd.git, thanks!

Signature · 2 lines

Best Regards,
Artem Bityutskiy