microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

staging: rts5208: combine ifs where possible 

Join together chained if's where possible to lower the indentation
level.

In a lot of places of this code the indentation level is already very
high.
As a result, this patch increases the code flow and readability.

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Giedrius Statkevičius 2014-10-04 00:31:17 +03:00 коммит произвёл Greg Kroah-Hartman
Родитель 8ce6b2d2b7
Коммит 175dbfae60
1 изменённых файлов: 44 добавлений и 56 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

100
drivers/staging/rts5208/rtsx_chip.c
Просмотреть файл

@ -289,12 +289,10 @@ int rtsx_reset_chip(struct rtsx_chip *chip)
/* Enable ASPM */ /* Enable ASPM */
if (chip->aspm_l0s_l1_en) { if (chip->aspm_l0s_l1_en) {
if (chip->dynamic_aspm) { if (chip->dynamic_aspm) {
if (CHK_SDIO_EXIST(chip)) { if (CHK_SDIO_EXIST(chip) && CHECK_PID(chip, 0x5288)) {
if (CHECK_PID(chip, 0x5288)) { retval = rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFF, chip->aspm_l0s_l1_en);
retval = rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFF, chip->aspm_l0s_l1_en); if (retval != STATUS_SUCCESS)
if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL);
TRACE_RET(chip, STATUS_FAIL);
}
} }
} else { } else {
if (CHECK_PID(chip, 0x5208)) if (CHECK_PID(chip, 0x5208))
@ -350,18 +348,14 @@ int rtsx_reset_chip(struct rtsx_chip *chip)
} }
if (CHECK_PID(chip, 0x5288)) { if (CHECK_PID(chip, 0x5288) && !CHK_SDIO_EXIST(chip)) {
if (!CHK_SDIO_EXIST(chip)) { retval = rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFFFF, 0x0103);
retval = rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFFFF, if (retval != STATUS_SUCCESS)
0x0103); TRACE_RET(chip, STATUS_FAIL);
if (retval != STATUS_SUCCESS)
TRACE_RET(chip, STATUS_FAIL);
retval = rtsx_write_cfg_dw(chip, 2, 0x84, 0xFF, 0x03); retval = rtsx_write_cfg_dw(chip, 2, 0x84, 0xFF, 0x03);
if (retval != STATUS_SUCCESS) if (retval != STATUS_SUCCESS)
TRACE_RET(chip, STATUS_FAIL); TRACE_RET(chip, STATUS_FAIL);
}
} }
RTSX_WRITE_REG(chip, IRQSTAT0, LINK_RDY_INT, LINK_RDY_INT); RTSX_WRITE_REG(chip, IRQSTAT0, LINK_RDY_INT, LINK_RDY_INT);
@ -1727,10 +1721,8 @@ int rtsx_pre_handle_interrupt(struct rtsx_chip *chip)
chip->ocp_int = ocp_int & status; chip->ocp_int = ocp_int & status;
#endif #endif
if (chip->sd_io) { if (chip->sd_io && (chip->int_reg & DATA_DONE_INT))
if (chip->int_reg & DATA_DONE_INT) chip->int_reg &= ~(u32)DATA_DONE_INT;
chip->int_reg &= ~(u32)DATA_DONE_INT;
}
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -1796,31 +1788,29 @@ void rtsx_do_before_power_down(struct rtsx_chip *chip, int pm_stat)
void rtsx_enable_aspm(struct rtsx_chip *chip) void rtsx_enable_aspm(struct rtsx_chip *chip)
{ {
if (chip->aspm_l0s_l1_en && chip->dynamic_aspm) { if (chip->aspm_l0s_l1_en && chip->dynamic_aspm && !chip->aspm_enabled) {
if (!chip->aspm_enabled) { dev_dbg(rtsx_dev(chip), "Try to enable ASPM\n");
dev_dbg(rtsx_dev(chip), "Try to enable ASPM\n"); chip->aspm_enabled = 1;
chip->aspm_enabled = 1;
if (chip->asic_code && CHECK_PID(chip, 0x5208)) if (chip->asic_code && CHECK_PID(chip, 0x5208))
rtsx_write_phy_register(chip, 0x07, 0); rtsx_write_phy_register(chip, 0x07, 0);
if (CHECK_PID(chip, 0x5208)) { if (CHECK_PID(chip, 0x5208)) {
rtsx_write_register(chip, ASPM_FORCE_CTL, 0xF3, rtsx_write_register(chip, ASPM_FORCE_CTL, 0xF3,
0x30 | chip->aspm_level[0]); 0x30 | chip->aspm_level[0]);
} else { } else {
rtsx_write_config_byte(chip, LCTLR, rtsx_write_config_byte(chip, LCTLR,
chip->aspm_l0s_l1_en); chip->aspm_l0s_l1_en);
} }
if (CHK_SDIO_EXIST(chip)) { if (CHK_SDIO_EXIST(chip)) {
u16 val = chip->aspm_l0s_l1_en | 0x0100; u16 val = chip->aspm_l0s_l1_en | 0x0100;
if (CHECK_PID(chip, 0x5288)) if (CHECK_PID(chip, 0x5288))
rtsx_write_cfg_dw(chip, 2, 0xC0, rtsx_write_cfg_dw(chip, 2, 0xC0,
0xFFFF, val); 0xFFFF, val);
else else
rtsx_write_cfg_dw(chip, 1, 0xC0, rtsx_write_cfg_dw(chip, 1, 0xC0,
0xFFFF, val); 0xFFFF, val);
}
} }
} }
} }
@ -1830,21 +1820,19 @@ void rtsx_disable_aspm(struct rtsx_chip *chip)
if (CHECK_PID(chip, 0x5208)) if (CHECK_PID(chip, 0x5208))
rtsx_monitor_aspm_config(chip); rtsx_monitor_aspm_config(chip);
if (chip->aspm_l0s_l1_en && chip->dynamic_aspm) { if (chip->aspm_l0s_l1_en && chip->dynamic_aspm && chip->aspm_enabled) {
if (chip->aspm_enabled) { dev_dbg(rtsx_dev(chip), "Try to disable ASPM\n");
dev_dbg(rtsx_dev(chip), "Try to disable ASPM\n"); chip->aspm_enabled = 0;
chip->aspm_enabled = 0;
if (chip->asic_code && CHECK_PID(chip, 0x5208)) if (chip->asic_code && CHECK_PID(chip, 0x5208))
rtsx_write_phy_register(chip, 0x07, 0x0129); rtsx_write_phy_register(chip, 0x07, 0x0129);
if (CHECK_PID(chip, 0x5208)) if (CHECK_PID(chip, 0x5208))
rtsx_write_register(chip, ASPM_FORCE_CTL, rtsx_write_register(chip, ASPM_FORCE_CTL,
0xF3, 0x30); 0xF3, 0x30);
else else
rtsx_write_config_byte(chip, LCTLR, 0x00); rtsx_write_config_byte(chip, LCTLR, 0x00);
wait_timeout(1); wait_timeout(1);
}
} }
} }