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

staging: rts5208: Fix line over 80 characters.

Fix checkpatch.pl issues with line over 80 characters in rtsx_card.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Gulsah Kose and committed by
Greg Kroah-Hartman 8470e791 78508655

+46 -23
+46 -23
drivers/staging/rts5208/rtsx_card.c
··· 105 105 RTSX_DEBUGP("reg 0xFF34: 0x%x, reg 0xFF38: 0x%x\n", reg1, reg2); 106 106 if ((reg1 & 0xC0) && (reg2 & 0xC0)) { 107 107 chip->sd_int = 1; 108 - rtsx_write_register(chip, SDIO_CTRL, 0xFF, SDIO_BUS_CTRL | SDIO_CD_CTRL); 109 - rtsx_write_register(chip, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_ON); 108 + rtsx_write_register(chip, SDIO_CTRL, 0xFF, 109 + SDIO_BUS_CTRL | SDIO_CD_CTRL); 110 + rtsx_write_register(chip, PWR_GATE_CTRL, 111 + LDO3318_PWR_MASK, LDO_ON); 110 112 } 111 113 } 112 114 ··· 454 452 } 455 453 456 454 #ifdef DISABLE_CARD_INT 457 - void card_cd_debounce(struct rtsx_chip *chip, unsigned long *need_reset, unsigned long *need_release) 455 + void card_cd_debounce(struct rtsx_chip *chip, unsigned long *need_reset, 456 + unsigned long *need_release) 458 457 { 459 458 u8 release_map = 0, reset_map = 0; 460 459 ··· 507 504 } 508 505 509 506 reset_map = 0; 510 - if (!(chip->card_exist & XD_CARD) && (xd_cnt > (DEBOUNCE_CNT-1))) 507 + if (!(chip->card_exist & XD_CARD) && 508 + (xd_cnt > (DEBOUNCE_CNT-1))) 511 509 reset_map |= XD_CARD; 512 - if (!(chip->card_exist & SD_CARD) && (sd_cnt > (DEBOUNCE_CNT-1))) 510 + if (!(chip->card_exist & SD_CARD) && 511 + (sd_cnt > (DEBOUNCE_CNT-1))) 513 512 reset_map |= SD_CARD; 514 - if (!(chip->card_exist & MS_CARD) && (ms_cnt > (DEBOUNCE_CNT-1))) 513 + if (!(chip->card_exist & MS_CARD) && 514 + (ms_cnt > (DEBOUNCE_CNT-1))) 515 515 reset_map |= MS_CARD; 516 516 } 517 517 ··· 555 549 if (!(chip->card_exist & MS_CARD)) 556 550 clear_bit(MS_NR, &(chip->need_release)); 557 551 558 - RTSX_DEBUGP("chip->need_release = 0x%x\n", (unsigned int)(chip->need_release)); 552 + RTSX_DEBUGP("chip->need_release = 0x%x\n", 553 + (unsigned int)(chip->need_release)); 559 554 560 555 #ifdef SUPPORT_OCP 561 556 if (chip->need_release) { ··· 595 588 596 589 release_xd_card(chip); 597 590 598 - if (CHECK_PID(chip, 0x5288) && CHECK_BARO_PKG(chip, QFN)) 599 - rtsx_write_register(chip, HOST_SLEEP_STATE, 0xC0, 0xC0); 591 + if (CHECK_PID(chip, 0x5288) && 592 + CHECK_BARO_PKG(chip, QFN)) 593 + rtsx_write_register(chip, HOST_SLEEP_STATE, 594 + 0xC0, 0xC0); 600 595 } 601 596 602 597 if (chip->need_release & MS_CARD) { ··· 619 610 } 620 611 621 612 if (chip->need_reset) { 622 - RTSX_DEBUGP("chip->need_reset = 0x%x\n", (unsigned int)(chip->need_reset)); 613 + RTSX_DEBUGP("chip->need_reset = 0x%x\n", 614 + (unsigned int)(chip->need_reset)); 623 615 624 616 rtsx_reset_cards(chip); 625 617 } 626 618 627 619 if (chip->need_reinit) { 628 - RTSX_DEBUGP("chip->need_reinit = 0x%x\n", (unsigned int)(chip->need_reinit)); 620 + RTSX_DEBUGP("chip->need_reinit = 0x%x\n", 621 + (unsigned int)(chip->need_reinit)); 629 622 630 623 rtsx_reinit_cards(chip, 0); 631 624 } ··· 652 641 max_N = 120; 653 642 max_div = CLK_DIV_4; 654 643 655 - RTSX_DEBUGP("Switch SSC clock to %dMHz (cur_clk = %d)\n", clk, chip->cur_clk); 644 + RTSX_DEBUGP("Switch SSC clock to %dMHz (cur_clk = %d)\n", 645 + clk, chip->cur_clk); 656 646 657 647 if ((clk <= 2) || (N > max_N)) 658 648 TRACE_RET(chip, STATUS_FAIL); ··· 688 676 rtsx_add_cmd(chip, WRITE_REG_CMD, SSC_DIV_N_0, 0xFF, N); 689 677 rtsx_add_cmd(chip, WRITE_REG_CMD, SSC_CTL1, SSC_RSTB, SSC_RSTB); 690 678 if (sd_vpclk_phase_reset) { 691 - rtsx_add_cmd(chip, WRITE_REG_CMD, SD_VPCLK0_CTL, PHASE_NOT_RESET, 0); 692 - rtsx_add_cmd(chip, WRITE_REG_CMD, SD_VPCLK0_CTL, PHASE_NOT_RESET, PHASE_NOT_RESET); 679 + rtsx_add_cmd(chip, WRITE_REG_CMD, SD_VPCLK0_CTL, 680 + PHASE_NOT_RESET, 0); 681 + rtsx_add_cmd(chip, WRITE_REG_CMD, SD_VPCLK0_CTL, 682 + PHASE_NOT_RESET, PHASE_NOT_RESET); 693 683 } 694 684 695 685 retval = rtsx_send_cmd(chip, 0, WAIT_TIME); ··· 800 786 801 787 if (sd_vpclk_phase_reset) { 802 788 udelay(200); 803 - RTSX_WRITE_REG(chip, SD_VPCLK0_CTL, PHASE_NOT_RESET, PHASE_NOT_RESET); 804 - RTSX_WRITE_REG(chip, SD_VPCLK1_CTL, PHASE_NOT_RESET, PHASE_NOT_RESET); 789 + RTSX_WRITE_REG(chip, SD_VPCLK0_CTL, PHASE_NOT_RESET, 790 + PHASE_NOT_RESET); 791 + RTSX_WRITE_REG(chip, SD_VPCLK1_CTL, PHASE_NOT_RESET, 792 + PHASE_NOT_RESET); 805 793 udelay(200); 806 794 } 807 795 RTSX_WRITE_REG(chip, CLK_CTL, 0xFF, 0); ··· 813 797 return STATUS_SUCCESS; 814 798 } 815 799 816 - void trans_dma_enable(enum dma_data_direction dir, struct rtsx_chip *chip, u32 byte_cnt, u8 pack_size) 800 + void trans_dma_enable(enum dma_data_direction dir, struct rtsx_chip *chip, 801 + u32 byte_cnt, u8 pack_size) 817 802 { 818 803 if (pack_size > DMA_1024) 819 804 pack_size = DMA_512; ··· 827 810 rtsx_add_cmd(chip, WRITE_REG_CMD, DMATC0, 0xFF, (u8)byte_cnt); 828 811 829 812 if (dir == DMA_FROM_DEVICE) { 830 - rtsx_add_cmd(chip, WRITE_REG_CMD, DMACTL, 0x03 | DMA_PACK_SIZE_MASK, 813 + rtsx_add_cmd(chip, WRITE_REG_CMD, DMACTL, 814 + 0x03 | DMA_PACK_SIZE_MASK, 831 815 DMA_DIR_FROM_CARD | DMA_EN | pack_size); 832 816 } else { 833 - rtsx_add_cmd(chip, WRITE_REG_CMD, DMACTL, 0x03 | DMA_PACK_SIZE_MASK, 817 + rtsx_add_cmd(chip, WRITE_REG_CMD, DMACTL, 818 + 0x03 | DMA_PACK_SIZE_MASK, 834 819 DMA_DIR_TO_CARD | DMA_EN | pack_size); 835 820 } 836 821 ··· 922 903 return STATUS_SUCCESS; 923 904 } 924 905 925 - int card_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 sec_addr, u16 sec_cnt) 906 + int card_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, 907 + u32 sec_addr, u16 sec_cnt) 926 908 { 927 909 int retval; 928 910 unsigned int lun = SCSI_LUN(srb); ··· 941 921 rtsx_release_chip(chip); 942 922 TRACE_RET(chip, STATUS_FAIL); 943 923 } 944 - if (detect_card_cd(chip, chip->cur_card) != STATUS_SUCCESS) 924 + if (detect_card_cd(chip, chip->cur_card) != 925 + STATUS_SUCCESS) 945 926 TRACE_RET(chip, STATUS_FAIL); 946 927 947 928 if (!chip->rw_need_retry) { ··· 1037 1016 void turn_on_led(struct rtsx_chip *chip, u8 gpio) 1038 1017 { 1039 1018 if (CHECK_PID(chip, 0x5288)) 1040 - rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), (u8)(1 << gpio)); 1019 + rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), 1020 + (u8)(1 << gpio)); 1041 1021 else 1042 1022 rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), 0); 1043 1023 } ··· 1048 1026 if (CHECK_PID(chip, 0x5288)) 1049 1027 rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), 0); 1050 1028 else 1051 - rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), (u8)(1 << gpio)); 1029 + rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), 1030 + (u8)(1 << gpio)); 1052 1031 } 1053 1032 1054 1033 int detect_card_cd(struct rtsx_chip *chip, int card)