dmaengine/dma_slave: introduce inline wrappers

[linux-2.6-block.git] / drivers / mtd / nand / gpmi-nand / gpmi-lib.c

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
index de4db7604a3ffb7cb110dd6e31150371e55658e4..2a200ba0bd1a2861b765993a2e042ed78e4dab4e 100644 (file)
--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
@@ -126,7 +126,7 @@ int gpmi_init(struct gpmi_nand_data *this)
        struct resources *r = &this->resources;
        int ret;
 
-       ret = clk_enable(r->clock);
+       ret = clk_prepare_enable(r->clock);
        if (ret)
                goto err_out;
        ret = gpmi_reset_block(r->gpmi_regs, false);
@@ -146,7 +146,7 @@ int gpmi_init(struct gpmi_nand_data *this)
        /* Select BCH ECC. */
        writel(BM_GPMI_CTRL1_BCH_MODE, r->gpmi_regs + HW_GPMI_CTRL1_SET);
 
-       clk_disable(r->clock);
+       clk_disable_unprepare(r->clock);
        return 0;
 err_out:
        return ret;
@@ -202,7 +202,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)
        ecc_strength  = bch_geo->ecc_strength >> 1;
        page_size     = bch_geo->page_size;
 
-       ret = clk_enable(r->clock);
+       ret = clk_prepare_enable(r->clock);
        if (ret)
                goto err_out;
 
@@ -229,7 +229,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)
        writel(BM_BCH_CTRL_COMPLETE_IRQ_EN,
                                r->bch_regs + HW_BCH_CTRL_SET);
 
-       clk_disable(r->clock);
+       clk_disable_unprepare(r->clock);
        return 0;
 err_out:
        return ret;
@@ -704,7 +704,7 @@ void gpmi_begin(struct gpmi_nand_data *this)
        int ret;
 
        /* Enable the clock. */
-       ret = clk_enable(r->clock);
+       ret = clk_prepare_enable(r->clock);
        if (ret) {
                pr_err("We failed in enable the clk\n");
                goto err_out;
@@ -773,7 +773,7 @@ err_out:
 void gpmi_end(struct gpmi_nand_data *this)
 {
        struct resources *r = &this->resources;
-       clk_disable(r->clock);
+       clk_disable_unprepare(r->clock);
 }
 
 /* Clears a BCH interrupt. */
@@ -825,9 +825,9 @@ int gpmi_send_command(struct gpmi_nand_data *this)
                | BM_GPMI_CTRL0_ADDRESS_INCREMENT
                | BF_GPMI_CTRL0_XFER_COUNT(this->command_length);
        pio[1] = pio[2] = 0;
-       desc = channel->device->device_prep_slave_sg(channel,
+       desc = dmaengine_prep_slave_sg(channel,
                                        (struct scatterlist *)pio,
-                                       ARRAY_SIZE(pio), DMA_NONE, 0);
+                                       ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
        if (!desc) {
                pr_err("step 1 error\n");
                return -1;
@@ -838,8 +838,7 @@ int gpmi_send_command(struct gpmi_nand_data *this)
 
        sg_init_one(sgl, this->cmd_buffer, this->command_length);
        dma_map_sg(this->dev, sgl, 1, DMA_TO_DEVICE);
-       desc = channel->device->device_prep_slave_sg(channel,
-                                       sgl, 1, DMA_TO_DEVICE, 1);
+       desc = dmaengine_prep_slave_sg(channel, sgl, 1, DMA_MEM_TO_DEV, 1);
        if (!desc) {
                pr_err("step 2 error\n");
                return -1;
@@ -870,9 +869,8 @@ int gpmi_send_data(struct gpmi_nand_data *this)
                | BF_GPMI_CTRL0_ADDRESS(address)
                | BF_GPMI_CTRL0_XFER_COUNT(this->upper_len);
        pio[1] = 0;
-       desc = channel->device->device_prep_slave_sg(channel,
-                                       (struct scatterlist *)pio,
-                                       ARRAY_SIZE(pio), DMA_NONE, 0);
+       desc = dmaengine_prep_slave_sg(channel, (struct scatterlist *)pio,
+                                       ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
        if (!desc) {
                pr_err("step 1 error\n");
                return -1;
@@ -880,8 +878,8 @@ int gpmi_send_data(struct gpmi_nand_data *this)
 
        /* [2] send DMA request */
        prepare_data_dma(this, DMA_TO_DEVICE);
-       desc = channel->device->device_prep_slave_sg(channel, &this->data_sgl,
-                                               1, DMA_TO_DEVICE, 1);
+       desc = dmaengine_prep_slave_sg(channel, &this->data_sgl,
+                                               1, DMA_MEM_TO_DEV, 1);
        if (!desc) {
                pr_err("step 2 error\n");
                return -1;
@@ -906,9 +904,9 @@ int gpmi_read_data(struct gpmi_nand_data *this)
                | BF_GPMI_CTRL0_ADDRESS(BV_GPMI_CTRL0_ADDRESS__NAND_DATA)
                | BF_GPMI_CTRL0_XFER_COUNT(this->upper_len);
        pio[1] = 0;
-       desc = channel->device->device_prep_slave_sg(channel,
+       desc = dmaengine_prep_slave_sg(channel,
                                        (struct scatterlist *)pio,
-                                       ARRAY_SIZE(pio), DMA_NONE, 0);
+                                       ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
        if (!desc) {
                pr_err("step 1 error\n");
                return -1;
@@ -916,8 +914,8 @@ int gpmi_read_data(struct gpmi_nand_data *this)
 
        /* [2] : send DMA request */
        prepare_data_dma(this, DMA_FROM_DEVICE);
-       desc = channel->device->device_prep_slave_sg(channel, &this->data_sgl,
-                                               1, DMA_FROM_DEVICE, 1);
+       desc = dmaengine_prep_slave_sg(channel, &this->data_sgl,
+                                       1, DMA_DEV_TO_MEM, 1);
        if (!desc) {
                pr_err("step 2 error\n");
                return -1;
@@ -962,9 +960,8 @@ int gpmi_send_page(struct gpmi_nand_data *this,
        pio[4] = payload;
        pio[5] = auxiliary;
 
-       desc = channel->device->device_prep_slave_sg(channel,
-                                       (struct scatterlist *)pio,
-                                       ARRAY_SIZE(pio), DMA_NONE, 0);
+       desc = dmaengine_prep_slave_sg(channel, (struct scatterlist *)pio,
+                                       ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
        if (!desc) {
                pr_err("step 2 error\n");
                return -1;
@@ -997,8 +994,9 @@ int gpmi_read_page(struct gpmi_nand_data *this,
                | BF_GPMI_CTRL0_ADDRESS(address)
                | BF_GPMI_CTRL0_XFER_COUNT(0);
        pio[1] = 0;
-       desc = channel->device->device_prep_slave_sg(channel,
-                               (struct scatterlist *)pio, 2, DMA_NONE, 0);
+       desc = dmaengine_prep_slave_sg(channel,
+                               (struct scatterlist *)pio, 2,
+                               DMA_TRANS_NONE, 0);
        if (!desc) {
                pr_err("step 1 error\n");
                return -1;
@@ -1025,9 +1023,9 @@ int gpmi_read_page(struct gpmi_nand_data *this,
        pio[3] = geo->page_size;
        pio[4] = payload;
        pio[5] = auxiliary;
-       desc = channel->device->device_prep_slave_sg(channel,
+       desc = dmaengine_prep_slave_sg(channel,
                                        (struct scatterlist *)pio,
-                                       ARRAY_SIZE(pio), DMA_NONE, 1);
+                                       ARRAY_SIZE(pio), DMA_TRANS_NONE, 1);
        if (!desc) {
                pr_err("step 2 error\n");
                return -1;
@@ -1044,8 +1042,9 @@ int gpmi_read_page(struct gpmi_nand_data *this,
                | BF_GPMI_CTRL0_ADDRESS(address)
                | BF_GPMI_CTRL0_XFER_COUNT(geo->page_size);
        pio[1] = 0;
-       desc = channel->device->device_prep_slave_sg(channel,
-                               (struct scatterlist *)pio, 2, DMA_NONE, 1);
+       desc = dmaengine_prep_slave_sg(channel,
+                               (struct scatterlist *)pio, 2,
+                               DMA_TRANS_NONE, 1);
        if (!desc) {
                pr_err("step 3 error\n");
                return -1;