diff options
| author | Vikram Narayanan <vikram186@gmail.com> | 2012-09-23 05:48:32 -0400 |
|---|---|---|
| committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-11-15 08:37:45 -0500 |
| commit | 2d350e5adb44b3fbc3b6d7ff5b8d086e7730c9b4 (patch) | |
| tree | 47cc77c25e8ce45dbad160790a622f7ad61844fb | |
| parent | 438db5a92b7526a12591f764042528a86d2ebb4b (diff) | |
mtd: gpmi-nand: make debug prints more clear
Make the error messages more debugging friendly
Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Acked-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
| -rw-r--r-- | drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index d79696b2f19b..e2c56fc4574b 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c | |||
| @@ -222,7 +222,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr) | |||
| 222 | 222 | ||
| 223 | ret = dma_map_sg(this->dev, sgl, 1, dr); | 223 | ret = dma_map_sg(this->dev, sgl, 1, dr); |
| 224 | if (ret == 0) | 224 | if (ret == 0) |
| 225 | pr_err("map failed.\n"); | 225 | pr_err("DMA mapping failed.\n"); |
| 226 | 226 | ||
| 227 | this->direct_dma_map_ok = false; | 227 | this->direct_dma_map_ok = false; |
| 228 | } | 228 | } |
| @@ -456,7 +456,7 @@ static int __devinit acquire_dma_channels(struct gpmi_nand_data *this) | |||
| 456 | 456 | ||
| 457 | dma_chan = dma_request_channel(mask, gpmi_dma_filter, this); | 457 | dma_chan = dma_request_channel(mask, gpmi_dma_filter, this); |
| 458 | if (!dma_chan) { | 458 | if (!dma_chan) { |
| 459 | pr_err("dma_request_channel failed.\n"); | 459 | pr_err("Failed to request DMA channel.\n"); |
| 460 | goto acquire_err; | 460 | goto acquire_err; |
| 461 | } | 461 | } |
| 462 | 462 | ||
| @@ -625,7 +625,8 @@ static int read_page_prepare(struct gpmi_nand_data *this, | |||
| 625 | length, DMA_FROM_DEVICE); | 625 | length, DMA_FROM_DEVICE); |
| 626 | if (dma_mapping_error(dev, dest_phys)) { | 626 | if (dma_mapping_error(dev, dest_phys)) { |
| 627 | if (alt_size < length) { | 627 | if (alt_size < length) { |
| 628 | pr_err("Alternate buffer is too small\n"); | 628 | pr_err("%s, Alternate buffer is too small\n", |
| 629 | __func__); | ||
| 629 | return -ENOMEM; | 630 | return -ENOMEM; |
| 630 | } | 631 | } |
| 631 | goto map_failed; | 632 | goto map_failed; |
| @@ -675,7 +676,8 @@ static int send_page_prepare(struct gpmi_nand_data *this, | |||
| 675 | DMA_TO_DEVICE); | 676 | DMA_TO_DEVICE); |
| 676 | if (dma_mapping_error(dev, source_phys)) { | 677 | if (dma_mapping_error(dev, source_phys)) { |
| 677 | if (alt_size < length) { | 678 | if (alt_size < length) { |
| 678 | pr_err("Alternate buffer is too small\n"); | 679 | pr_err("%s, Alternate buffer is too small\n", |
| 680 | __func__); | ||
| 679 | return -ENOMEM; | 681 | return -ENOMEM; |
| 680 | } | 682 | } |
| 681 | goto map_failed; | 683 | goto map_failed; |
| @@ -763,7 +765,7 @@ static int gpmi_alloc_dma_buffer(struct gpmi_nand_data *this) | |||
| 763 | 765 | ||
| 764 | error_alloc: | 766 | error_alloc: |
| 765 | gpmi_free_dma_buffer(this); | 767 | gpmi_free_dma_buffer(this); |
| 766 | pr_err("allocate DMA buffer ret!!\n"); | 768 | pr_err("Error allocating DMA buffers!\n"); |
| 767 | return -ENOMEM; | 769 | return -ENOMEM; |
| 768 | } | 770 | } |
| 769 | 771 | ||
| @@ -1474,7 +1476,7 @@ static int gpmi_set_geometry(struct gpmi_nand_data *this) | |||
| 1474 | /* Set up the NFC geometry which is used by BCH. */ | 1476 | /* Set up the NFC geometry which is used by BCH. */ |
| 1475 | ret = bch_set_geometry(this); | 1477 | ret = bch_set_geometry(this); |
| 1476 | if (ret) { | 1478 | if (ret) { |
| 1477 | pr_err("set geometry ret : %d\n", ret); | 1479 | pr_err("Error setting BCH geometry : %d\n", ret); |
| 1478 | return ret; | 1480 | return ret; |
| 1479 | } | 1481 | } |
| 1480 | 1482 | ||
