Commit 4aa906f1 authored by Vasyl Gomonovych's avatar Vasyl Gomonovych Committed by Miquel Raynal
Browse files

mtd: cadence: Fix cast to pointer from integer of different size warning 



Use dma_addr_t type to pass memory address and control data in
DMA descriptor fields memory_pointer and ctrl_data_ptr
To fix warning: cast to pointer from integer of different size

Signed-off-by: default avatarVasyl Gomonovych <gomonovych@gmail.com>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 4114b17a

drivers/mtd/nand/raw/cadence-nand-controller.c

+6 −7
Original line number Diff line number Diff line
@@ -914,8 +914,8 @@ static void cadence_nand_get_caps(struct cdns_nand_ctrl *cdns_ctrl) 
/* Prepare CDMA descriptor. */

static void

cadence_nand_cdma_desc_prepare(struct cdns_nand_ctrl *cdns_ctrl,

			       char nf_mem, u32 flash_ptr, char *mem_ptr,

			       char *ctrl_data_ptr, u16 ctype)

			       char nf_mem, u32 flash_ptr, dma_addr_t mem_ptr,

				   dma_addr_t ctrl_data_ptr, u16 ctype)

{

	struct cadence_nand_cdma_desc *cdma_desc = cdns_ctrl->cdma_desc;
@@ -931,13 +931,13 @@ cadence_nand_cdma_desc_prepare(struct cdns_nand_ctrl *cdns_ctrl, 
	cdma_desc->command_flags |= CDMA_CF_DMA_MASTER;

	cdma_desc->command_flags  |= CDMA_CF_INT;



	cdma_desc->memory_pointer = (uintptr_t)mem_ptr;

	cdma_desc->memory_pointer = mem_ptr;

	cdma_desc->status = 0;

	cdma_desc->sync_flag_pointer = 0;

	cdma_desc->sync_arguments = 0;



	cdma_desc->command_type = ctype;

	cdma_desc->ctrl_data_ptr = (uintptr_t)ctrl_data_ptr;

	cdma_desc->ctrl_data_ptr = ctrl_data_ptr;

}



static u8 cadence_nand_check_desc_error(struct cdns_nand_ctrl *cdns_ctrl,
@@ -1280,8 +1280,7 @@ cadence_nand_cdma_transfer(struct cdns_nand_ctrl *cdns_ctrl, u8 chip_nr, 
	}



	cadence_nand_cdma_desc_prepare(cdns_ctrl, chip_nr, page,

				       (void *)dma_buf, (void *)dma_ctrl_dat,

				       ctype);

				       dma_buf, dma_ctrl_dat, ctype);



	status = cadence_nand_cdma_send_and_wait(cdns_ctrl, thread_nr);
@@ -1360,7 +1359,7 @@ static int cadence_nand_erase(struct nand_chip *chip, u32 page) 


	cadence_nand_cdma_desc_prepare(cdns_ctrl,

				       cdns_chip->cs[chip->cur_cs],

				       page, NULL, NULL,

				       page, 0, 0,

				       CDMA_CT_ERASE);

	status = cadence_nand_cdma_send_and_wait(cdns_ctrl, thread_nr);

	if (status) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE