From 64d6a2696d08ead3878572af667f579b17a119ba Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Sun, 23 Sep 2012 15:18:32 +0530 Subject: [PATCH] --- yaml --- r: 347135 b: refs/heads/master c: 2d350e5adb44b3fbc3b6d7ff5b8d086e7730c9b4 h: refs/heads/master i: 347133: 7244b3fa3dcfdfa3399589cedb556ffe1871e667 347131: 7699ec230e8ca2e976d180225d5f2c2d879d4b80 347127: fd2e2ce5e1e248a80c236f43d073178f34e4222b 347119: 30cd2eed24e840642fdb85e691c25f0f17a5551e 347103: 595cf7060155a7e564e380c7d6fffb6d3565110f 347071: d2e2e6deb94ed046439d27bcefb65b47f0e0d6b8 347007: d8abd798b26a9c7bc5c27b90c0b544e01c0250f9 346879: ecedc3942fbe01d459dae66aa7ea1a03021ea154 346623: ba5383829df44978c396d8c5300c2f8dc931e463 346111: d15aff18d8d0cc2de217a2b2cea0e1a38dcb9ec8 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e53f17fa30e8..e93a053e9922 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 438db5a92b7526a12591f764042528a86d2ebb4b +refs/heads/master: 2d350e5adb44b3fbc3b6d7ff5b8d086e7730c9b4 diff --git a/trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index d79696b2f19b..e2c56fc4574b 100644 --- a/trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/trunk/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) 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; } @@ -625,7 +625,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; @@ -675,7 +676,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; @@ -763,7 +765,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; } @@ -1474,7 +1476,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; }