Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ef7e206 authored by Shawn Guo's avatar Shawn Guo Committed by Vinod Koul
Browse files

mtd: gpmi-nand: move to dma_transfer_direction 



This patch fixes usage of dma direction to adopt dma_transfer_direction.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 4e82786f

drivers/mtd/nand/gpmi-nand/gpmi-lib.c

+12 −10
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ int gpmi_send_command(struct gpmi_nand_data *this) 
	pio[1] = pio[2] = 0;

	desc = channel->device->device_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;
@@ -839,7 +839,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);

					sgl, 1, DMA_MEM_TO_DEV, 1);

	if (!desc) {

		pr_err("step 2 error\n");

		return -1;
@@ -872,7 +872,7 @@ int gpmi_send_data(struct gpmi_nand_data *this) 
	pio[1] = 0;

	desc = channel->device->device_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;
@@ -881,7 +881,7 @@ 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);

						1, DMA_MEM_TO_DEV, 1);

	if (!desc) {

		pr_err("step 2 error\n");

		return -1;
@@ -908,7 +908,7 @@ int gpmi_read_data(struct gpmi_nand_data *this) 
	pio[1] = 0;

	desc = channel->device->device_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;
@@ -917,7 +917,7 @@ 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);

						1, DMA_DEV_TO_MEM, 1);

	if (!desc) {

		pr_err("step 2 error\n");

		return -1;
@@ -964,7 +964,7 @@ int gpmi_send_page(struct gpmi_nand_data *this, 


	desc = channel->device->device_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 2 error\n");

		return -1;
@@ -998,7 +998,8 @@ int gpmi_read_page(struct gpmi_nand_data *this, 
		| BF_GPMI_CTRL0_XFER_COUNT(0);

	pio[1] = 0;

	desc = channel->device->device_prep_slave_sg(channel,

				(struct scatterlist *)pio, 2, DMA_NONE, 0);

				(struct scatterlist *)pio, 2,

				DMA_TRANS_NONE, 0);

	if (!desc) {

		pr_err("step 1 error\n");

		return -1;
@@ -1027,7 +1028,7 @@ int gpmi_read_page(struct gpmi_nand_data *this, 
	pio[5] = auxiliary;

	desc = channel->device->device_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;
@@ -1045,7 +1046,8 @@ int gpmi_read_page(struct gpmi_nand_data *this, 
		| 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);

				(struct scatterlist *)pio, 2,

				DMA_TRANS_NONE, 1);

	if (!desc) {

		pr_err("step 3 error\n");

		return -1;