openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: denali: remove unnecessary casts 

Useless casts result in unreadable source code.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Masahiro Yamada 2014-09-09 11:01:53 +09:00 committed by Brian Norris
parent 5637b69d1c
commit 3157d1ed23
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/mtd/nand/denali.c
View File

@ -423,10 +423,10 @@ static void find_valid_banks(struct denali_nand_info *denali)
denali->total_used_banks = 1; denali->total_used_banks = 1;
for (i = 0; i < denali->max_banks; i++) { for (i = 0; i < denali->max_banks; i++) {
index_addr(denali, (uint32_t)(MODE_11 | (i << 24) | 0), 0x90); index_addr(denali, MODE_11 | (i << 24) | 0, 0x90);
index_addr(denali, (uint32_t)(MODE_11 | (i << 24) | 1), 0); index_addr(denali, MODE_11 | (i << 24) | 1, 0);
index_addr_read_data(denali, index_addr_read_data(denali,
(uint32_t)(MODE_11 | (i << 24) | 2), &id[i]); MODE_11 | (i << 24) | 2, &id[i]);
dev_dbg(denali->dev, dev_dbg(denali->dev,
"Return 1st ID for bank[%d]: %x\n", i, id[i]); "Return 1st ID for bank[%d]: %x\n", i, id[i]);
@ -510,9 +510,9 @@ static uint16_t denali_nand_timing_set(struct denali_nand_info *denali)
* For some NAND chips, controller can't report the correct * For some NAND chips, controller can't report the correct
* device ID by reading from DEVICE_ID register * device ID by reading from DEVICE_ID register
*/ */
addr = (uint32_t)MODE_11 | BANK(denali->flash_bank); addr = MODE_11 | BANK(denali->flash_bank);
index_addr(denali, (uint32_t)addr | 0, 0x90); index_addr(denali, addr | 0, 0x90);
index_addr(denali, (uint32_t)addr | 1, 0); index_addr(denali, addr | 1, 0);
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
index_addr_read_data(denali, addr | 2, &id_bytes[i]); index_addr_read_data(denali, addr | 2, &id_bytes[i]);
maf_id = id_bytes[0]; maf_id = id_bytes[0];
@ -782,14 +782,14 @@ static int denali_send_pipeline_cmd(struct denali_nand_info *denali,
} else if (op == DENALI_WRITE && access_type == SPARE_ACCESS) { } else if (op == DENALI_WRITE && access_type == SPARE_ACCESS) {
/* read spare area */ /* read spare area */
cmd = MODE_10 | addr; cmd = MODE_10 | addr;
index_addr(denali, (uint32_t)cmd, access_type); index_addr(denali, cmd, access_type);
cmd = MODE_01 | addr; cmd = MODE_01 | addr;
iowrite32(cmd, denali->flash_mem); iowrite32(cmd, denali->flash_mem);
} else if (op == DENALI_READ) { } else if (op == DENALI_READ) {
/* setup page read request for access type */ /* setup page read request for access type */
cmd = MODE_10 | addr; cmd = MODE_10 | addr;
index_addr(denali, (uint32_t)cmd, access_type); index_addr(denali, cmd, access_type);
/* /*
* page 33 of the NAND controller spec indicates we should not * page 33 of the NAND controller spec indicates we should not
@ -800,7 +800,7 @@ static int denali_send_pipeline_cmd(struct denali_nand_info *denali,
cmd = MODE_01 | addr; cmd = MODE_01 | addr;
iowrite32(cmd, denali->flash_mem); iowrite32(cmd, denali->flash_mem);
} else { } else {
index_addr(denali, (uint32_t)cmd, index_addr(denali, cmd,
PIPELINE_ACCESS | op | page_count); PIPELINE_ACCESS | op | page_count);
/* /*
@ -929,7 +929,7 @@ static void read_oob_data(struct mtd_info *mtd, uint8_t *buf, int page)
*/ */
addr = BANK(denali->flash_bank) | denali->page; addr = BANK(denali->flash_bank) | denali->page;
cmd = MODE_10 | addr; cmd = MODE_10 | addr;
index_addr(denali, (uint32_t)cmd, MAIN_ACCESS); index_addr(denali, cmd, MAIN_ACCESS);
} }
} }
@ -1035,7 +1035,7 @@ static void denali_setup_dma(struct denali_nand_info *denali, int op)
{ {
uint32_t mode; uint32_t mode;
const int page_count = 1; const int page_count = 1;
dma_addr_t addr = denali->buf.dma_buf; uint32_t addr = denali->buf.dma_buf;
mode = MODE_10 | BANK(denali->flash_bank); mode = MODE_10 | BANK(denali->flash_bank);
@ -1045,10 +1045,10 @@ static void denali_setup_dma(struct denali_nand_info *denali, int op)
index_addr(denali, mode | denali->page, 0x2000 | op | page_count); index_addr(denali, mode | denali->page, 0x2000 | op | page_count);
/* 2. set memory high address bits 23:8 */ /* 2. set memory high address bits 23:8 */
index_addr(denali, mode | ((uint16_t)(addr >> 16) << 8), 0x2200); index_addr(denali, mode | ((addr >> 16) << 8), 0x2200);
/* 3. set memory low address bits 23:8 */ /* 3. set memory low address bits 23:8 */
index_addr(denali, mode | ((uint16_t)addr << 8), 0x2300); index_addr(denali, mode | ((addr & 0xff) << 8), 0x2300);
/* 4. interrupt when complete, burst len = 64 bytes */ /* 4. interrupt when complete, burst len = 64 bytes */
index_addr(denali, mode | 0x14000, 0x2400); index_addr(denali, mode | 0x14000, 0x2400);
@ -1287,7 +1287,7 @@ static int denali_erase(struct mtd_info *mtd, int page)
/* setup page read request for access type */ /* setup page read request for access type */
cmd = MODE_10 | BANK(denali->flash_bank) | page; cmd = MODE_10 | BANK(denali->flash_bank) | page;
index_addr(denali, (uint32_t)cmd, 0x1); index_addr(denali, cmd, 0x1);
/* wait for erase to complete or failure to occur */ /* wait for erase to complete or failure to occur */
irq_status = wait_for_irq(denali, INTR_STATUS__ERASE_COMP | irq_status = wait_for_irq(denali, INTR_STATUS__ERASE_COMP |
@ -1317,12 +1317,12 @@ static void denali_cmdfunc(struct mtd_info *mtd, unsigned int cmd, int col,
* e.g. some of Micron MT29F32G08QAA MLC NAND chips * e.g. some of Micron MT29F32G08QAA MLC NAND chips
* So here we send READID cmd to NAND insteand * So here we send READID cmd to NAND insteand
*/ */
addr = (uint32_t)MODE_11 | BANK(denali->flash_bank); addr = MODE_11 | BANK(denali->flash_bank);
index_addr(denali, (uint32_t)addr | 0, 0x90); index_addr(denali, addr | 0, 0x90);
index_addr(denali, (uint32_t)addr | 1, 0); index_addr(denali, addr | 1, 0);
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
index_addr_read_data(denali, index_addr_read_data(denali,
(uint32_t)addr | 2, addr | 2,
&id); &id);
write_byte_to_buf(denali, id); write_byte_to_buf(denali, id);
} }