tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mfd: rtsx: Using pcr_dbg replace dev_dbg

pcr_dbg is a wrapper of dev_dbg, which can save some code,
and help to enable/disable debug message static.

Signed-off-by: Micky Ching <micky_ching@realsil.com.cn>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Micky Ching and committed by
Lee Jones 0523b8f4 41bc2334

+35 -41
+5 -6
drivers/mfd/rtl8411.c
··· 53 53 u8 reg3 = 0; 54 54 55 55 rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG1, &reg1); 56 - dev_dbg(&(pcr->pci->dev), "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg1); 56 + pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg1); 57 57 58 58 if (!rtsx_vendor_setting_valid(reg1)) 59 59 return; ··· 65 65 pcr->card_drive_sel |= rtsx_reg_to_card_drive_sel(reg1); 66 66 67 67 rtsx_pci_read_config_byte(pcr, PCR_SETTING_REG3, &reg3); 68 - dev_dbg(&(pcr->pci->dev), "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG3, reg3); 68 + pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG3, reg3); 69 69 pcr->sd30_drive_sel_3v3 = rtl8411_reg_to_sd30_drive_sel_3v3(reg3); 70 70 } 71 71 ··· 74 74 u32 reg = 0; 75 75 76 76 rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG1, &reg); 77 - dev_dbg(&(pcr->pci->dev), "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg); 77 + pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg); 78 78 79 79 if (!rtsx_vendor_setting_valid(reg)) 80 80 return; ··· 260 260 rtsx_pci_write_register(pcr, CARD_PWR_CTL, 261 261 BPP_POWER_MASK, BPP_POWER_OFF); 262 262 263 - dev_dbg(&(pcr->pci->dev), 264 - "After CD deglitch, card_exist = 0x%x\n", 265 - card_exist); 263 + pcr_dbg(pcr, "After CD deglitch, card_exist = 0x%x\n", 264 + card_exist); 266 265 } 267 266 268 267 if (card_exist & MS_EXIST) {
+2 -2
drivers/mfd/rts5209.c
··· 38 38 u32 reg; 39 39 40 40 rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG1, &reg); 41 - dev_dbg(&(pcr->pci->dev), "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg); 41 + pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg); 42 42 43 43 if (rts5209_vendor_setting1_valid(reg)) { 44 44 if (rts5209_reg_check_ms_pmos(reg)) ··· 47 47 } 48 48 49 49 rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG2, &reg); 50 - dev_dbg(&(pcr->pci->dev), "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg); 50 + pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg); 51 51 52 52 if (rts5209_vendor_setting2_valid(reg)) { 53 53 pcr->sd30_drive_sel_1v8 =
+2 -2
drivers/mfd/rts5227.c
··· 63 63 u32 reg; 64 64 65 65 rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG1, &reg); 66 - dev_dbg(&(pcr->pci->dev), "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg); 66 + pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg); 67 67 68 68 if (!rtsx_vendor_setting_valid(reg)) 69 69 return; ··· 74 74 pcr->card_drive_sel |= rtsx_reg_to_card_drive_sel(reg); 75 75 76 76 rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG2, &reg); 77 - dev_dbg(&(pcr->pci->dev), "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg); 77 + pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg); 78 78 pcr->sd30_drive_sel_3v3 = rtsx_reg_to_sd30_drive_sel_3v3(reg); 79 79 if (rtsx_reg_check_reverse_socket(reg)) 80 80 pcr->flags |= PCR_REVERSE_SOCKET;
+2 -2
drivers/mfd/rts5229.c
··· 38 38 u32 reg; 39 39 40 40 rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG1, &reg); 41 - dev_dbg(&(pcr->pci->dev), "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg); 41 + pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg); 42 42 43 43 if (!rtsx_vendor_setting_valid(reg)) 44 44 return; ··· 50 50 pcr->card_drive_sel |= rtsx_reg_to_card_drive_sel(reg); 51 51 52 52 rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG2, &reg); 53 - dev_dbg(&(pcr->pci->dev), "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg); 53 + pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg); 54 54 pcr->sd30_drive_sel_3v3 = 55 55 map_sd_drive(rtsx_reg_to_sd30_drive_sel_3v3(reg)); 56 56 }
+2 -2
drivers/mfd/rts5249.c
··· 70 70 u32 reg; 71 71 72 72 rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG1, &reg); 73 - dev_dbg(&(pcr->pci->dev), "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg); 73 + pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg); 74 74 75 75 if (!rtsx_vendor_setting_valid(reg)) { 76 76 pcr_dbg(pcr, "skip fetch vendor setting\n"); ··· 83 83 pcr->card_drive_sel |= rtsx_reg_to_card_drive_sel(reg); 84 84 85 85 rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG2, &reg); 86 - dev_dbg(&(pcr->pci->dev), "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg); 86 + pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg); 87 87 pcr->sd30_drive_sel_3v3 = rtsx_reg_to_sd30_drive_sel_3v3(reg); 88 88 if (rtsx_reg_check_reverse_socket(reg)) 89 89 pcr->flags |= PCR_REVERSE_SOCKET;
+22 -27
drivers/mfd/rtsx_pcr.c
··· 316 316 timeleft = wait_for_completion_interruptible_timeout( 317 317 &trans_done, msecs_to_jiffies(timeout)); 318 318 if (timeleft <= 0) { 319 - dev_dbg(&(pcr->pci->dev), "Timeout (%s %d)\n", 320 - __func__, __LINE__); 319 + pcr_dbg(pcr, "Timeout (%s %d)\n", __func__, __LINE__); 321 320 err = -ETIMEDOUT; 322 321 goto finish_send_cmd; 323 322 } ··· 352 353 u64 val; 353 354 u8 option = SG_VALID | SG_TRANS_DATA; 354 355 355 - dev_dbg(&(pcr->pci->dev), "DMA addr: 0x%x, Len: 0x%x\n", 356 - (unsigned int)addr, len); 356 + pcr_dbg(pcr, "DMA addr: 0x%x, Len: 0x%x\n", (unsigned int)addr, len); 357 357 358 358 if (end) 359 359 option |= SG_END; ··· 367 369 { 368 370 int err = 0, count; 369 371 370 - dev_dbg(&(pcr->pci->dev), "--> %s: num_sg = %d\n", __func__, num_sg); 372 + pcr_dbg(pcr, "--> %s: num_sg = %d\n", __func__, num_sg); 371 373 count = rtsx_pci_dma_map_sg(pcr, sglist, num_sg, read); 372 374 if (count < 1) 373 375 return -EINVAL; 374 - dev_dbg(&(pcr->pci->dev), "DMA mapping count: %d\n", count); 376 + pcr_dbg(pcr, "DMA mapping count: %d\n", count); 375 377 376 378 err = rtsx_pci_dma_transfer(pcr, sglist, count, read, timeout); 377 379 ··· 445 447 timeleft = wait_for_completion_interruptible_timeout( 446 448 &trans_done, msecs_to_jiffies(timeout)); 447 449 if (timeleft <= 0) { 448 - dev_dbg(&(pcr->pci->dev), "Timeout (%s %d)\n", 449 - __func__, __LINE__); 450 + pcr_dbg(pcr, "Timeout (%s %d)\n", __func__, __LINE__); 450 451 err = -ETIMEDOUT; 451 452 goto out; 452 453 } ··· 619 622 /* Enable Bus Interrupt */ 620 623 rtsx_pci_writel(pcr, RTSX_BIER, pcr->bier); 621 624 622 - dev_dbg(&(pcr->pci->dev), "RTSX_BIER: 0x%08x\n", pcr->bier); 625 + pcr_dbg(pcr, "RTSX_BIER: 0x%08x\n", pcr->bier); 623 626 } 624 627 625 628 static inline u8 double_ssc_depth(u8 depth) ··· 665 668 return err; 666 669 667 670 card_clock /= 1000000; 668 - dev_dbg(&(pcr->pci->dev), "Switch card clock to %dMHz\n", card_clock); 671 + pcr_dbg(pcr, "Switch card clock to %dMHz\n", card_clock); 669 672 670 673 clk = card_clock; 671 674 if (!initial_mode && double_clk) 672 675 clk = card_clock * 2; 673 - dev_dbg(&(pcr->pci->dev), 674 - "Internal SSC clock: %dMHz (cur_clock = %d)\n", 675 - clk, pcr->cur_clock); 676 + pcr_dbg(pcr, "Internal SSC clock: %dMHz (cur_clock = %d)\n", 677 + clk, pcr->cur_clock); 676 678 677 679 if (clk == pcr->cur_clock) 678 680 return 0; ··· 700 704 } 701 705 div++; 702 706 } 703 - dev_dbg(&(pcr->pci->dev), "n = %d, div = %d\n", n, div); 707 + pcr_dbg(pcr, "n = %d, div = %d\n", n, div); 704 708 705 709 ssc_depth = depth[ssc_depth]; 706 710 if (double_clk) 707 711 ssc_depth = double_ssc_depth(ssc_depth); 708 712 709 713 ssc_depth = revise_ssc_depth(ssc_depth, div); 710 - dev_dbg(&(pcr->pci->dev), "ssc_depth = %d\n", ssc_depth); 714 + pcr_dbg(pcr, "ssc_depth = %d\n", ssc_depth); 711 715 712 716 rtsx_pci_init_cmd(pcr); 713 717 rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, CLK_CTL, ··· 829 833 dwork = to_delayed_work(work); 830 834 pcr = container_of(dwork, struct rtsx_pcr, carddet_work); 831 835 832 - dev_dbg(&(pcr->pci->dev), "--> %s\n", __func__); 836 + pcr_dbg(pcr, "--> %s\n", __func__); 833 837 834 838 mutex_lock(&pcr->pcr_mutex); 835 839 spin_lock_irqsave(&pcr->lock, flags); 836 840 837 841 irq_status = rtsx_pci_readl(pcr, RTSX_BIPR); 838 - dev_dbg(&(pcr->pci->dev), "irq_status: 0x%08x\n", irq_status); 842 + pcr_dbg(pcr, "irq_status: 0x%08x\n", irq_status); 839 843 840 844 irq_status &= CARD_EXIST; 841 845 card_inserted = pcr->card_inserted & irq_status; ··· 846 850 spin_unlock_irqrestore(&pcr->lock, flags); 847 851 848 852 if (card_inserted || card_removed) { 849 - dev_dbg(&(pcr->pci->dev), 850 - "card_inserted: 0x%x, card_removed: 0x%x\n", 851 - card_inserted, card_removed); 853 + pcr_dbg(pcr, "card_inserted: 0x%x, card_removed: 0x%x\n", 854 + card_inserted, card_removed); 852 855 853 856 if (pcr->ops->cd_deglitch) 854 857 card_inserted = pcr->ops->cd_deglitch(pcr); ··· 955 960 struct delayed_work *dwork = to_delayed_work(work); 956 961 struct rtsx_pcr *pcr = container_of(dwork, struct rtsx_pcr, idle_work); 957 962 958 - dev_dbg(&(pcr->pci->dev), "--> %s\n", __func__); 963 + pcr_dbg(pcr, "--> %s\n", __func__); 959 964 960 965 mutex_lock(&pcr->pcr_mutex); 961 966 ··· 1123 1128 break; 1124 1129 } 1125 1130 1126 - dev_dbg(&(pcr->pci->dev), "PID: 0x%04x, IC version: 0x%02x\n", 1131 + pcr_dbg(pcr, "PID: 0x%04x, IC version: 0x%02x\n", 1127 1132 PCI_PID(pcr), pcr->ic_version); 1128 1133 1129 1134 pcr->slots = kcalloc(pcr->num_slots, sizeof(struct rtsx_slot), ··· 1134 1139 if (pcr->ops->fetch_vendor_settings) 1135 1140 pcr->ops->fetch_vendor_settings(pcr); 1136 1141 1137 - dev_dbg(&(pcr->pci->dev), "pcr->aspm_en = 0x%x\n", pcr->aspm_en); 1138 - dev_dbg(&(pcr->pci->dev), "pcr->sd30_drive_sel_1v8 = 0x%x\n", 1142 + pcr_dbg(pcr, "pcr->aspm_en = 0x%x\n", pcr->aspm_en); 1143 + pcr_dbg(pcr, "pcr->sd30_drive_sel_1v8 = 0x%x\n", 1139 1144 pcr->sd30_drive_sel_1v8); 1140 - dev_dbg(&(pcr->pci->dev), "pcr->sd30_drive_sel_3v3 = 0x%x\n", 1145 + pcr_dbg(pcr, "pcr->sd30_drive_sel_3v3 = 0x%x\n", 1141 1146 pcr->sd30_drive_sel_3v3); 1142 - dev_dbg(&(pcr->pci->dev), "pcr->card_drive_sel = 0x%x\n", 1147 + pcr_dbg(pcr, "pcr->card_drive_sel = 0x%x\n", 1143 1148 pcr->card_drive_sel); 1144 - dev_dbg(&(pcr->pci->dev), "pcr->flags = 0x%x\n", pcr->flags); 1149 + pcr_dbg(pcr, "pcr->flags = 0x%x\n", pcr->flags); 1145 1150 1146 1151 pcr->state = PDEV_STAT_IDLE; 1147 1152 err = rtsx_pci_init_hw(pcr);