Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8470e791 authored by Gulsah Kose's avatar Gulsah Kose Committed by Greg Kroah-Hartman
Browse files

staging: rts5208: Fix line over 80 characters. 



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

Signed-off-by: default avatarGulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78508655

drivers/staging/rts5208/rtsx_card.c

+46 −23
Original line number Diff line number Diff line
@@ -105,8 +105,10 @@ void try_to_switch_sdio_ctrl(struct rtsx_chip *chip) 
	RTSX_DEBUGP("reg 0xFF34: 0x%x, reg 0xFF38: 0x%x\n", reg1, reg2);

	if ((reg1 & 0xC0) && (reg2 & 0xC0)) {

		chip->sd_int = 1;

		rtsx_write_register(chip, SDIO_CTRL, 0xFF, SDIO_BUS_CTRL | SDIO_CD_CTRL);

		rtsx_write_register(chip, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_ON);

		rtsx_write_register(chip, SDIO_CTRL, 0xFF,

				SDIO_BUS_CTRL | SDIO_CD_CTRL);

		rtsx_write_register(chip, PWR_GATE_CTRL,

				LDO3318_PWR_MASK, LDO_ON);

	}

}
@@ -452,7 +454,8 @@ void rtsx_reinit_cards(struct rtsx_chip *chip, int reset_chip) 
}



#ifdef DISABLE_CARD_INT

void card_cd_debounce(struct rtsx_chip *chip, unsigned long *need_reset, unsigned long *need_release)

void card_cd_debounce(struct rtsx_chip *chip, unsigned long *need_reset,

		unsigned long *need_release)

{

	u8 release_map = 0, reset_map = 0;
@@ -504,11 +507,14 @@ void card_cd_debounce(struct rtsx_chip *chip, unsigned long *need_reset, unsigne 
		}



		reset_map = 0;

		if (!(chip->card_exist & XD_CARD) && (xd_cnt > (DEBOUNCE_CNT-1)))

		if (!(chip->card_exist & XD_CARD) &&

				(xd_cnt > (DEBOUNCE_CNT-1)))

			reset_map |= XD_CARD;

		if (!(chip->card_exist & SD_CARD) && (sd_cnt > (DEBOUNCE_CNT-1)))

		if (!(chip->card_exist & SD_CARD) &&

				(sd_cnt > (DEBOUNCE_CNT-1)))

			reset_map |= SD_CARD;

		if (!(chip->card_exist & MS_CARD) && (ms_cnt > (DEBOUNCE_CNT-1)))

		if (!(chip->card_exist & MS_CARD) &&

				(ms_cnt > (DEBOUNCE_CNT-1)))

			reset_map |= MS_CARD;

	}
@@ -549,7 +555,8 @@ void rtsx_init_cards(struct rtsx_chip *chip) 
		if (!(chip->card_exist & MS_CARD))

			clear_bit(MS_NR, &(chip->need_release));



		RTSX_DEBUGP("chip->need_release = 0x%x\n", (unsigned int)(chip->need_release));

		RTSX_DEBUGP("chip->need_release = 0x%x\n",

				(unsigned int)(chip->need_release));



#ifdef SUPPORT_OCP

		if (chip->need_release) {
@@ -588,8 +595,10 @@ void rtsx_init_cards(struct rtsx_chip *chip) 


			release_xd_card(chip);



			if (CHECK_PID(chip, 0x5288) && CHECK_BARO_PKG(chip, QFN))

				rtsx_write_register(chip, HOST_SLEEP_STATE, 0xC0, 0xC0);

			if (CHECK_PID(chip, 0x5288) &&

					CHECK_BARO_PKG(chip, QFN))

				rtsx_write_register(chip, HOST_SLEEP_STATE,

						0xC0, 0xC0);

		}



		if (chip->need_release & MS_CARD) {
@@ -610,13 +619,15 @@ void rtsx_init_cards(struct rtsx_chip *chip) 
	}



	if (chip->need_reset) {

		RTSX_DEBUGP("chip->need_reset = 0x%x\n", (unsigned int)(chip->need_reset));

		RTSX_DEBUGP("chip->need_reset = 0x%x\n",

				(unsigned int)(chip->need_reset));



		rtsx_reset_cards(chip);

	}



	if (chip->need_reinit) {

		RTSX_DEBUGP("chip->need_reinit = 0x%x\n", (unsigned int)(chip->need_reinit));

		RTSX_DEBUGP("chip->need_reinit = 0x%x\n",

				(unsigned int)(chip->need_reinit));



		rtsx_reinit_cards(chip, 0);

	}
@@ -641,7 +652,8 @@ int switch_ssc_clock(struct rtsx_chip *chip, int clk) 
	max_N = 120;

	max_div = CLK_DIV_4;



	RTSX_DEBUGP("Switch SSC clock to %dMHz (cur_clk = %d)\n", clk, chip->cur_clk);

	RTSX_DEBUGP("Switch SSC clock to %dMHz (cur_clk = %d)\n",

			clk, chip->cur_clk);



	if ((clk <= 2) || (N > max_N))

		TRACE_RET(chip, STATUS_FAIL);
@@ -676,8 +688,10 @@ int switch_ssc_clock(struct rtsx_chip *chip, int clk) 
	rtsx_add_cmd(chip, WRITE_REG_CMD, SSC_DIV_N_0, 0xFF, N);

	rtsx_add_cmd(chip, WRITE_REG_CMD, SSC_CTL1, SSC_RSTB, SSC_RSTB);

	if (sd_vpclk_phase_reset) {

		rtsx_add_cmd(chip, WRITE_REG_CMD, SD_VPCLK0_CTL, PHASE_NOT_RESET, 0);

		rtsx_add_cmd(chip, WRITE_REG_CMD, SD_VPCLK0_CTL, PHASE_NOT_RESET, PHASE_NOT_RESET);

		rtsx_add_cmd(chip, WRITE_REG_CMD, SD_VPCLK0_CTL,

			PHASE_NOT_RESET, 0);

		rtsx_add_cmd(chip, WRITE_REG_CMD, SD_VPCLK0_CTL,

			PHASE_NOT_RESET, PHASE_NOT_RESET);

	}



	retval = rtsx_send_cmd(chip, 0, WAIT_TIME);
@@ -786,8 +800,10 @@ int switch_normal_clock(struct rtsx_chip *chip, int clk) 


	if (sd_vpclk_phase_reset) {

		udelay(200);

		RTSX_WRITE_REG(chip, SD_VPCLK0_CTL, PHASE_NOT_RESET, PHASE_NOT_RESET);

		RTSX_WRITE_REG(chip, SD_VPCLK1_CTL, PHASE_NOT_RESET, PHASE_NOT_RESET);

		RTSX_WRITE_REG(chip, SD_VPCLK0_CTL, PHASE_NOT_RESET,

				PHASE_NOT_RESET);

		RTSX_WRITE_REG(chip, SD_VPCLK1_CTL, PHASE_NOT_RESET,

				PHASE_NOT_RESET);

		udelay(200);

	}

	RTSX_WRITE_REG(chip, CLK_CTL, 0xFF, 0);
@@ -797,7 +813,8 @@ int switch_normal_clock(struct rtsx_chip *chip, int clk) 
	return STATUS_SUCCESS;

}



void trans_dma_enable(enum dma_data_direction dir, struct rtsx_chip *chip, u32 byte_cnt, u8 pack_size)

void trans_dma_enable(enum dma_data_direction dir, struct rtsx_chip *chip,

		u32 byte_cnt, u8 pack_size)

{

	if (pack_size > DMA_1024)

		pack_size = DMA_512;
@@ -810,10 +827,12 @@ void trans_dma_enable(enum dma_data_direction dir, struct rtsx_chip *chip, u32 b 
	rtsx_add_cmd(chip, WRITE_REG_CMD, DMATC0, 0xFF, (u8)byte_cnt);



	if (dir == DMA_FROM_DEVICE) {

		rtsx_add_cmd(chip, WRITE_REG_CMD, DMACTL, 0x03 | DMA_PACK_SIZE_MASK,

		rtsx_add_cmd(chip, WRITE_REG_CMD, DMACTL,

			0x03 | DMA_PACK_SIZE_MASK,

			     DMA_DIR_FROM_CARD | DMA_EN | pack_size);

	} else {

		rtsx_add_cmd(chip, WRITE_REG_CMD, DMACTL, 0x03 | DMA_PACK_SIZE_MASK,

		rtsx_add_cmd(chip, WRITE_REG_CMD, DMACTL,

			0x03 | DMA_PACK_SIZE_MASK,

			     DMA_DIR_TO_CARD | DMA_EN | pack_size);

	}
@@ -903,7 +922,8 @@ int card_power_off(struct rtsx_chip *chip, u8 card) 
	return STATUS_SUCCESS;

}



int card_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 sec_addr, u16 sec_cnt)

int card_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,

	u32 sec_addr, u16 sec_cnt)

{

	int retval;

	unsigned int lun = SCSI_LUN(srb);
@@ -921,7 +941,8 @@ int card_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 sec_addr, u16 sec 
				rtsx_release_chip(chip);

				TRACE_RET(chip, STATUS_FAIL);

			}

			if (detect_card_cd(chip, chip->cur_card) != STATUS_SUCCESS)

			if (detect_card_cd(chip, chip->cur_card) !=

							STATUS_SUCCESS)

				TRACE_RET(chip, STATUS_FAIL);



			if (!chip->rw_need_retry) {
@@ -1016,7 +1037,8 @@ void toggle_gpio(struct rtsx_chip *chip, u8 gpio) 
void turn_on_led(struct rtsx_chip *chip, u8 gpio)

{

	if (CHECK_PID(chip, 0x5288))

		rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), (u8)(1 << gpio));

		rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio),

				(u8)(1 << gpio));

	else

		rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), 0);

}
@@ -1026,7 +1048,8 @@ void turn_off_led(struct rtsx_chip *chip, u8 gpio) 
	if (CHECK_PID(chip, 0x5288))

		rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), 0);

	else

		rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), (u8)(1 << gpio));

		rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio),

				(u8)(1 << gpio));

}



int detect_card_cd(struct rtsx_chip *chip, int card)