Skip to content

Commit 4aa906f

Browse files
Carmichael561miquelraynal
authored andcommitted
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: Vasyl Gomonovych <[email protected]> Acked-by: Olof Johansson <[email protected]> Signed-off-by: Miquel Raynal <[email protected]>
1 parent 4114b17 commit 4aa906f

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,8 @@ static void cadence_nand_get_caps(struct cdns_nand_ctrl *cdns_ctrl)
914914
/* Prepare CDMA descriptor. */
915915
static void
916916
cadence_nand_cdma_desc_prepare(struct cdns_nand_ctrl *cdns_ctrl,
917-
char nf_mem, u32 flash_ptr, char *mem_ptr,
918-
char *ctrl_data_ptr, u16 ctype)
917+
char nf_mem, u32 flash_ptr, dma_addr_t mem_ptr,
918+
dma_addr_t ctrl_data_ptr, u16 ctype)
919919
{
920920
struct cadence_nand_cdma_desc *cdma_desc = cdns_ctrl->cdma_desc;
921921

@@ -931,13 +931,13 @@ cadence_nand_cdma_desc_prepare(struct cdns_nand_ctrl *cdns_ctrl,
931931
cdma_desc->command_flags |= CDMA_CF_DMA_MASTER;
932932
cdma_desc->command_flags |= CDMA_CF_INT;
933933

934-
cdma_desc->memory_pointer = (uintptr_t)mem_ptr;
934+
cdma_desc->memory_pointer = mem_ptr;
935935
cdma_desc->status = 0;
936936
cdma_desc->sync_flag_pointer = 0;
937937
cdma_desc->sync_arguments = 0;
938938

939939
cdma_desc->command_type = ctype;
940-
cdma_desc->ctrl_data_ptr = (uintptr_t)ctrl_data_ptr;
940+
cdma_desc->ctrl_data_ptr = ctrl_data_ptr;
941941
}
942942

943943
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,
12801280
}
12811281

12821282
cadence_nand_cdma_desc_prepare(cdns_ctrl, chip_nr, page,
1283-
(void *)dma_buf, (void *)dma_ctrl_dat,
1284-
ctype);
1283+
dma_buf, dma_ctrl_dat, ctype);
12851284

12861285
status = cadence_nand_cdma_send_and_wait(cdns_ctrl, thread_nr);
12871286

@@ -1360,7 +1359,7 @@ static int cadence_nand_erase(struct nand_chip *chip, u32 page)
13601359

13611360
cadence_nand_cdma_desc_prepare(cdns_ctrl,
13621361
cdns_chip->cs[chip->cur_cs],
1363-
page, NULL, NULL,
1362+
page, 0, 0,
13641363
CDMA_CT_ERASE);
13651364
status = cadence_nand_cdma_send_and_wait(cdns_ctrl, thread_nr);
13661365
if (status) {

0 commit comments

Comments
 (0)