diff options
author | Fabio Falzoi <fabio.falzoi84@gmail.com> | 2014-07-30 00:15:53 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-30 17:22:18 -0700 |
commit | bf6c0d110e0b7a06227f24a86249fad0a252eeea (patch) | |
tree | ad446774d52ad16a6abb26db40d0538af4e8a3d3 /drivers/staging/rts5208/xd.c | |
parent | 9036b4e976460f8475df3fef4cb9e03b086e30e1 (diff) | |
download | linux-bf6c0d110e0b7a06227f24a86249fad0a252eeea.tar.bz2 |
Staging: rts5208: Replace custom macro with dev_dbg
Use dev_dbg macro to control tracing verbosity through dynamic debug facility.
Signed-off-by: Fabio Falzoi <fabio.falzoi84@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rts5208/xd.c')
-rw-r--r-- | drivers/staging/rts5208/xd.c | 104 |
1 files changed, 55 insertions, 49 deletions
diff --git a/drivers/staging/rts5208/xd.c b/drivers/staging/rts5208/xd.c index 6aef53d14e31..0d029fe92b40 100644 --- a/drivers/staging/rts5208/xd.c +++ b/drivers/staging/rts5208/xd.c @@ -253,13 +253,13 @@ static int xd_read_cis(struct rtsx_chip *chip, u32 page_addr, u8 *buf, RTSX_READ_REG(chip, XD_ECC_BIT1, &ecc_bit); RTSX_READ_REG(chip, XD_ECC_BYTE1, &ecc_byte); - RTSX_DEBUGP("ECC_BIT1 = 0x%x, ECC_BYTE1 = 0x%x\n", + dev_dbg(rtsx_dev(chip), "ECC_BIT1 = 0x%x, ECC_BYTE1 = 0x%x\n", ecc_bit, ecc_byte); if (ecc_byte < buf_len) { - RTSX_DEBUGP("Before correct: 0x%x\n", + dev_dbg(rtsx_dev(chip), "Before correct: 0x%x\n", buf[ecc_byte]); buf[ecc_byte] ^= (1 << ecc_bit); - RTSX_DEBUGP("After correct: 0x%x\n", + dev_dbg(rtsx_dev(chip), "After correct: 0x%x\n", buf[ecc_byte]); } } @@ -275,13 +275,13 @@ static int xd_read_cis(struct rtsx_chip *chip, u32 page_addr, u8 *buf, RTSX_READ_REG(chip, XD_ECC_BIT2, &ecc_bit); RTSX_READ_REG(chip, XD_ECC_BYTE2, &ecc_byte); - RTSX_DEBUGP("ECC_BIT2 = 0x%x, ECC_BYTE2 = 0x%x\n", + dev_dbg(rtsx_dev(chip), "ECC_BIT2 = 0x%x, ECC_BYTE2 = 0x%x\n", ecc_bit, ecc_byte); if (ecc_byte < buf_len) { - RTSX_DEBUGP("Before correct: 0x%x\n", + dev_dbg(rtsx_dev(chip), "Before correct: 0x%x\n", buf[ecc_byte]); buf[ecc_byte] ^= (1 << ecc_bit); - RTSX_DEBUGP("After correct: 0x%x\n", + dev_dbg(rtsx_dev(chip), "After correct: 0x%x\n", buf[ecc_byte]); } } @@ -449,7 +449,7 @@ static int reset_xd(struct rtsx_chip *chip) #ifdef SUPPORT_OCP wait_timeout(50); if (chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER)) { - RTSX_DEBUGP("Over current, OCPSTAT is 0x%x\n", + dev_dbg(rtsx_dev(chip), "Over current, OCPSTAT is 0x%x\n", chip->ocp_stat); TRACE_RET(chip, STATUS_FAIL); } @@ -507,7 +507,8 @@ static int reset_xd(struct rtsx_chip *chip) ptr = rtsx_get_cmd_data(chip) + 1; - RTSX_DEBUGP("XD_DAT: 0x%x, XD_CTL: 0x%x\n", ptr[0], ptr[1]); + dev_dbg(rtsx_dev(chip), "XD_DAT: 0x%x, XD_CTL: 0x%x\n", + ptr[0], ptr[1]); if (((ptr[0] & READY_FLAG) != READY_STATE) || !(ptr[1] & XD_RDY)) @@ -517,7 +518,7 @@ static int reset_xd(struct rtsx_chip *chip) if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL); - RTSX_DEBUGP("READ_ID: 0x%x 0x%x 0x%x 0x%x\n", + dev_dbg(rtsx_dev(chip), "READ_ID: 0x%x 0x%x 0x%x 0x%x\n", id_buf[0], id_buf[1], id_buf[2], id_buf[3]); xd_card->device_code = id_buf[1]; @@ -618,8 +619,8 @@ static int reset_xd(struct rtsx_chip *chip) retval = xd_read_id(chip, READ_xD_ID, id_buf, 4); if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL); - RTSX_DEBUGP("READ_xD_ID: 0x%x 0x%x 0x%x 0x%x\n", - id_buf[0], id_buf[1], id_buf[2], id_buf[3]); + dev_dbg(rtsx_dev(chip), "READ_xD_ID: 0x%x 0x%x 0x%x 0x%x\n", + id_buf[0], id_buf[1], id_buf[2], id_buf[3]); if (id_buf[2] != XD_ID_CODE) TRACE_RET(chip, STATUS_FAIL); @@ -682,7 +683,7 @@ static int reset_xd(struct rtsx_chip *chip) break; } - RTSX_DEBUGP("CIS block: 0x%x\n", xd_card->cis_block); + dev_dbg(rtsx_dev(chip), "CIS block: 0x%x\n", xd_card->cis_block); if (xd_card->cis_block == 0xFFFF) TRACE_RET(chip, STATUS_FAIL); @@ -735,13 +736,14 @@ static int xd_init_l2p_tbl(struct rtsx_chip *chip) struct xd_info *xd_card = &(chip->xd_card); int size, i; - RTSX_DEBUGP("xd_init_l2p_tbl: zone_cnt = %d\n", xd_card->zone_cnt); + dev_dbg(rtsx_dev(chip), "xd_init_l2p_tbl: zone_cnt = %d\n", + xd_card->zone_cnt); if (xd_card->zone_cnt < 1) TRACE_RET(chip, STATUS_FAIL); size = xd_card->zone_cnt * sizeof(struct zone_entry); - RTSX_DEBUGP("Buffer size for l2p table is %d\n", size); + dev_dbg(rtsx_dev(chip), "Buffer size for l2p table is %d\n", size); xd_card->zone = vmalloc(size); if (!xd_card->zone) @@ -761,8 +763,6 @@ static int xd_init_l2p_tbl(struct rtsx_chip *chip) static inline void free_zone(struct zone_entry *zone) { - RTSX_DEBUGP("free_zone\n"); - if (!zone) return; @@ -788,7 +788,7 @@ static void xd_set_unused_block(struct rtsx_chip *chip, u32 phy_blk) zone_no = (int)phy_blk >> 10; if (zone_no >= xd_card->zone_cnt) { - RTSX_DEBUGP("Set unused block to invalid zone (zone_no = %d, zone_cnt = %d)\n", + dev_dbg(rtsx_dev(chip), "Set unused block to invalid zone (zone_no = %d, zone_cnt = %d)\n", zone_no, xd_card->zone_cnt); return; } @@ -802,11 +802,12 @@ static void xd_set_unused_block(struct rtsx_chip *chip, u32 phy_blk) if ((zone->set_index >= XD_FREE_TABLE_CNT) || (zone->set_index < 0)) { free_zone(zone); - RTSX_DEBUGP("Set unused block fail, invalid set_index\n"); + dev_dbg(rtsx_dev(chip), "Set unused block fail, invalid set_index\n"); return; } - RTSX_DEBUGP("Set unused block to index %d\n", zone->set_index); + dev_dbg(rtsx_dev(chip), "Set unused block to index %d\n", + zone->set_index); zone->free_table[zone->set_index++] = (u16) (phy_blk & 0x3ff); if (zone->set_index >= XD_FREE_TABLE_CNT) @@ -821,7 +822,7 @@ static u32 xd_get_unused_block(struct rtsx_chip *chip, int zone_no) u32 phy_blk; if (zone_no >= xd_card->zone_cnt) { - RTSX_DEBUGP("Get unused block from invalid zone (zone_no = %d, zone_cnt = %d)\n", + dev_dbg(rtsx_dev(chip), "Get unused block from invalid zone (zone_no = %d, zone_cnt = %d)\n", zone_no, xd_card->zone_cnt); return BLK_NOT_FOUND; } @@ -830,16 +831,17 @@ static u32 xd_get_unused_block(struct rtsx_chip *chip, int zone_no) if ((zone->unused_blk_cnt == 0) || (zone->set_index == zone->get_index)) { free_zone(zone); - RTSX_DEBUGP("Get unused block fail, no unused block available\n"); + dev_dbg(rtsx_dev(chip), "Get unused block fail, no unused block available\n"); return BLK_NOT_FOUND; } if ((zone->get_index >= XD_FREE_TABLE_CNT) || (zone->get_index < 0)) { free_zone(zone); - RTSX_DEBUGP("Get unused block fail, invalid get_index\n"); + dev_dbg(rtsx_dev(chip), "Get unused block fail, invalid get_index\n"); return BLK_NOT_FOUND; } - RTSX_DEBUGP("Get unused block from index %d\n", zone->get_index); + dev_dbg(rtsx_dev(chip), "Get unused block from index %d\n", + zone->get_index); phy_blk = zone->free_table[zone->get_index]; zone->free_table[zone->get_index++] = 0xFFFF; @@ -875,20 +877,20 @@ static u32 xd_get_l2p_tbl(struct rtsx_chip *chip, int zone_no, u16 log_off) #ifdef XD_DELAY_WRITE retval = xd_delay_write(chip); if (retval != STATUS_SUCCESS) { - RTSX_DEBUGP("In xd_get_l2p_tbl, delay write fail!\n"); + dev_dbg(rtsx_dev(chip), "In xd_get_l2p_tbl, delay write fail!\n"); return BLK_NOT_FOUND; } #endif if (zone->unused_blk_cnt <= 0) { - RTSX_DEBUGP("No unused block!\n"); + dev_dbg(rtsx_dev(chip), "No unused block!\n"); return BLK_NOT_FOUND; } for (i = 0; i < zone->unused_blk_cnt; i++) { phy_blk = xd_get_unused_block(chip, zone_no); if (phy_blk == BLK_NOT_FOUND) { - RTSX_DEBUGP("No unused block available!\n"); + dev_dbg(rtsx_dev(chip), "No unused block available!\n"); return BLK_NOT_FOUND; } @@ -898,7 +900,7 @@ static u32 xd_get_l2p_tbl(struct rtsx_chip *chip, int zone_no, u16 log_off) break; } if (i >= zone->unused_blk_cnt) { - RTSX_DEBUGP("No good unused block available!\n"); + dev_dbg(rtsx_dev(chip), "No good unused block available!\n"); return BLK_NOT_FOUND; } @@ -946,7 +948,7 @@ static int xd_mark_bad_block(struct rtsx_chip *chip, u32 phy_blk) u32 page_addr; u8 reg = 0; - RTSX_DEBUGP("mark block 0x%x as bad block\n", phy_blk); + dev_dbg(rtsx_dev(chip), "mark block 0x%x as bad block\n", phy_blk); if (phy_blk == BLK_NOT_FOUND) TRACE_RET(chip, STATUS_FAIL); @@ -998,7 +1000,7 @@ static int xd_init_page(struct rtsx_chip *chip, u32 phy_blk, u32 page_addr; u8 reg = 0; - RTSX_DEBUGP("Init block 0x%x\n", phy_blk); + dev_dbg(rtsx_dev(chip), "Init block 0x%x\n", phy_blk); if (start_page > end_page) TRACE_RET(chip, STATUS_FAIL); @@ -1052,7 +1054,7 @@ static int xd_copy_page(struct rtsx_chip *chip, u32 old_blk, u32 new_blk, u8 i, reg = 0; int retval; - RTSX_DEBUGP("Copy page from block 0x%x to block 0x%x\n", + dev_dbg(rtsx_dev(chip), "Copy page from block 0x%x to block 0x%x\n", old_blk, new_blk); if (start_page > end_page) @@ -1112,7 +1114,8 @@ static int xd_copy_page(struct rtsx_chip *chip, u32 old_blk, u32 new_blk, XD_BLOCK_STATUS, 0xFF, XD_GBLK); XD_SET_BAD_OLDBLK(xd_card); - RTSX_DEBUGP("old block 0x%x ecc error\n", old_blk); + dev_dbg(rtsx_dev(chip), "old block 0x%x ecc error\n", + old_blk); } } else { xd_set_err_code(chip, XD_TO_ERROR); @@ -1245,7 +1248,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no) u16 cur_lst_page_logoff, ent_lst_page_logoff; u8 redunt[11]; - RTSX_DEBUGP("xd_build_l2p_tbl: %d\n", zone_no); + dev_dbg(rtsx_dev(chip), "xd_build_l2p_tbl: %d\n", zone_no); if (xd_card->zone == NULL) { retval = xd_init_l2p_tbl(chip); @@ -1254,7 +1257,8 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no) } if (xd_card->zone[zone_no].build_flag) { - RTSX_DEBUGP("l2p table of zone %d has been built\n", zone_no); + dev_dbg(rtsx_dev(chip), "l2p table of zone %d has been built\n", + zone_no); return STATUS_SUCCESS; } @@ -1292,7 +1296,8 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no) max_logoff = 999; } - RTSX_DEBUGP("start block 0x%x, end block 0x%x\n", start, end); + dev_dbg(rtsx_dev(chip), "start block 0x%x, end block 0x%x\n", + start, end); zone->set_index = zone->get_index = 0; zone->unused_blk_cnt = 0; @@ -1306,12 +1311,12 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no) continue; if (redunt[BLOCK_STATUS] != 0xFF) { - RTSX_DEBUGP("bad block\n"); + dev_dbg(rtsx_dev(chip), "bad block\n"); continue; } if (xd_check_data_blank(redunt)) { - RTSX_DEBUGP("blank block\n"); + dev_dbg(rtsx_dev(chip), "blank block\n"); xd_set_unused_block(chip, i); continue; } @@ -1397,8 +1402,10 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no) i++; } - RTSX_DEBUGP("Block count %d, invalid L2P entry %d\n", end, i); - RTSX_DEBUGP("Total unused block: %d\n", zone->unused_blk_cnt); + dev_dbg(rtsx_dev(chip), "Block count %d, invalid L2P entry %d\n", + end, i); + dev_dbg(rtsx_dev(chip), "Total unused block: %d\n", + zone->unused_blk_cnt); if ((zone->unused_blk_cnt - i) < 1) chip->card_wp |= XD_CARD; @@ -1566,8 +1573,8 @@ static int xd_finish_write(struct rtsx_chip *chip, int retval, zone_no; u16 log_off; - RTSX_DEBUGP("xd_finish_write, old_blk = 0x%x, new_blk = 0x%x, log_blk = 0x%x\n", - old_blk, new_blk, log_blk); + dev_dbg(rtsx_dev(chip), "xd_finish_write, old_blk = 0x%x, new_blk = 0x%x, log_blk = 0x%x\n", + old_blk, new_blk, log_blk); if (page_off > xd_card->page_off) TRACE_RET(chip, STATUS_FAIL); @@ -1621,7 +1628,7 @@ static int xd_prepare_write(struct rtsx_chip *chip, { int retval; - RTSX_DEBUGP("%s, old_blk = 0x%x, new_blk = 0x%x, log_blk = 0x%x, page_off = %d\n", + dev_dbg(rtsx_dev(chip), "%s, old_blk = 0x%x, new_blk = 0x%x, log_blk = 0x%x, page_off = %d\n", __func__, old_blk, new_blk, log_blk, (int)page_off); if (page_off) { @@ -1645,8 +1652,8 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk, u16 log_off; u8 page_cnt, reg_val; - RTSX_DEBUGP("%s, old_blk = 0x%x, new_blk = 0x%x, log_blk = 0x%x\n", - __func__, old_blk, new_blk, log_blk); + dev_dbg(rtsx_dev(chip), "%s, old_blk = 0x%x, new_blk = 0x%x, log_blk = 0x%x\n", + __func__, old_blk, new_blk, log_blk); if (start_page > end_page) TRACE_RET(chip, STATUS_FAIL); @@ -1740,7 +1747,7 @@ int xd_delay_write(struct rtsx_chip *chip) int retval; if (delay_write->delay_write_flag) { - RTSX_DEBUGP("xd_delay_write\n"); + dev_dbg(rtsx_dev(chip), "xd_delay_write\n"); retval = xd_switch_clock(chip); if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL); @@ -1777,7 +1784,8 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, xd_card->cleanup_counter = 0; - RTSX_DEBUGP("xd_rw: scsi_sg_count = %d\n", scsi_sg_count(srb)); + dev_dbg(rtsx_dev(chip), "xd_rw: scsi_sg_count = %d\n", + scsi_sg_count(srb)); ptr = (u8 *)scsi_sglist(srb); @@ -1887,7 +1895,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, } } - RTSX_DEBUGP("old_blk = 0x%x\n", old_blk); + dev_dbg(rtsx_dev(chip), "old_blk = 0x%x\n", old_blk); while (total_sec_cnt) { if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) { @@ -2029,7 +2037,7 @@ void xd_cleanup_work(struct rtsx_chip *chip) struct xd_info *xd_card = &(chip->xd_card); if (xd_card->delay_write.delay_write_flag) { - RTSX_DEBUGP("xD: delay write\n"); + dev_dbg(rtsx_dev(chip), "xD: delay write\n"); xd_delay_write(chip); xd_card->cleanup_counter = 0; } @@ -2070,8 +2078,6 @@ int release_xd_card(struct rtsx_chip *chip) struct xd_info *xd_card = &(chip->xd_card); int retval; - RTSX_DEBUGP("release_xd_card\n"); - chip->card_ready &= ~XD_CARD; chip->card_fail &= ~XD_CARD; chip->card_wp &= ~XD_CARD; |