1 files changed, 24 insertions, 17 deletions

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index d79696b2f19b..5cd141f7bfc2 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -25,7 +25,6 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/mtd/gpmi-nand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/of.h>
@@ -33,6 +32,12 @@
 #include <linux/of_mtd.h>
 #include "gpmi-nand.h"
 
+/* Resource names for the GPMI NAND driver. */
+#define GPMI_NAND_GPMI_REGS_ADDR_RES_NAME  "gpmi-nand"
+#define GPMI_NAND_BCH_REGS_ADDR_RES_NAME   "bch"
+#define GPMI_NAND_BCH_INTERRUPT_RES_NAME   "bch"
+#define GPMI_NAND_DMA_INTERRUPT_RES_NAME   "gpmi-dma"
+
 /* add our owner bbt descriptor */
 static uint8_t scan_ff_pattern[] = { 0xff };
 static struct nand_bbt_descr gpmi_bbt_descr = {
@@ -222,7 +227,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;
         }
@@ -314,7 +319,7 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
         return 0;
 }
 
-static int __devinit
+static int
 acquire_register_block(struct gpmi_nand_data *this, const char *res_name)
 {
         struct platform_device *pdev = this->pdev;
@@ -355,7 +360,7 @@ static void release_register_block(struct gpmi_nand_data *this)
         res->bch_regs = NULL;
 }
 
-static int __devinit
+static int
 acquire_bch_irq(struct gpmi_nand_data *this, irq_handler_t irq_h)
 {
         struct platform_device *pdev = this->pdev;
@@ -422,7 +427,7 @@ static void release_dma_channels(struct gpmi_nand_data *this)
                 }
 }
 
-static int __devinit acquire_dma_channels(struct gpmi_nand_data *this)
+static int acquire_dma_channels(struct gpmi_nand_data *this)
 {
         struct platform_device *pdev = this->pdev;
         struct resource *r_dma;
@@ -456,7 +461,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;
         }
 
@@ -487,7 +492,7 @@ static char *extra_clks_for_mx6q[GPMI_CLK_MAX] = {
         "gpmi_apb", "gpmi_bch", "gpmi_bch_apb", "per1_bch",
 };
 
-static int __devinit gpmi_get_clks(struct gpmi_nand_data *this)
+static int gpmi_get_clks(struct gpmi_nand_data *this)
 {
         struct resources *r = &this->resources;
         char **extra_clks = NULL;
@@ -533,7 +538,7 @@ err_clock:
         return -ENOMEM;
 }
 
-static int __devinit acquire_resources(struct gpmi_nand_data *this)
+static int acquire_resources(struct gpmi_nand_data *this)
 {
         struct pinctrl *pinctrl;
         int ret;
@@ -583,7 +588,7 @@ static void release_resources(struct gpmi_nand_data *this)
         release_dma_channels(this);
 }
 
-static int __devinit init_hardware(struct gpmi_nand_data *this)
+static int init_hardware(struct gpmi_nand_data *this)
 {
         int ret;
 
@@ -625,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;
@@ -675,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;
@@ -763,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;
 }
 
@@ -1474,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;
         }
 
@@ -1535,7 +1542,7 @@ static void gpmi_nfc_exit(struct gpmi_nand_data *this)
         gpmi_free_dma_buffer(this);
 }
 
-static int __devinit gpmi_nfc_init(struct gpmi_nand_data *this)
+static int gpmi_nfc_init(struct gpmi_nand_data *this)
 {
         struct mtd_info  *mtd = &this->mtd;
         struct nand_chip *chip = &this->nand;
@@ -1618,7 +1625,7 @@ static const struct of_device_id gpmi_nand_id_table[] = {
 };
 MODULE_DEVICE_TABLE(of, gpmi_nand_id_table);
 
-static int __devinit gpmi_nand_probe(struct platform_device *pdev)
+static int gpmi_nand_probe(struct platform_device *pdev)
 {
         struct gpmi_nand_data *this;
         const struct of_device_id *of_id;
@@ -1668,7 +1675,7 @@ exit_acquire_resources:
         return ret;
 }
 
-static int __devexit gpmi_nand_remove(struct platform_device *pdev)
+static int gpmi_nand_remove(struct platform_device *pdev)
 {
         struct gpmi_nand_data *this = platform_get_drvdata(pdev);
 
@@ -1685,7 +1692,7 @@ static struct platform_driver gpmi_nand_driver = {
                 .of_match_table = gpmi_nand_id_table,
         },
         .probe   = gpmi_nand_probe,
-        .remove  = __devexit_p(gpmi_nand_remove),
+        .remove  = gpmi_nand_remove,
         .id_table = gpmi_ids,
 };
 module_platform_driver(gpmi_nand_driver);