Skip to content

Commit

Permalink
mfd: rtsx: Simplify function return logic
Browse files Browse the repository at this point in the history
The invoked functions already return zero on success or a negative
errno code so there is no need to open code the logic in the caller.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Javier Martinez Canillas authored and Lee Jones committed Oct 30, 2015
1 parent d8498df commit b158b69
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 25 deletions.
6 changes: 1 addition & 5 deletions drivers/mfd/rts5209.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,7 @@ static int rts5209_card_power_on(struct rtsx_pcr *pcr, int card)
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, CARD_PWR_CTL, pwr_mask, pwr_on);
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PWR_GATE_CTRL,
LDO3318_PWR_MASK, 0x00);
err = rtsx_pci_send_cmd(pcr, 100);
if (err < 0)
return err;

return 0;
return rtsx_pci_send_cmd(pcr, 100);
}

static int rts5209_card_power_off(struct rtsx_pcr *pcr, int card)
Expand Down
6 changes: 1 addition & 5 deletions drivers/mfd/rts5227.c
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,7 @@ static int rts5227_card_power_on(struct rtsx_pcr *pcr, int card)
SD_POWER_MASK, SD_POWER_ON);
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PWR_GATE_CTRL,
LDO3318_PWR_MASK, 0x06);
err = rtsx_pci_send_cmd(pcr, 100);
if (err < 0)
return err;

return 0;
return rtsx_pci_send_cmd(pcr, 100);
}

static int rts5227_card_power_off(struct rtsx_pcr *pcr, int card)
Expand Down
6 changes: 1 addition & 5 deletions drivers/mfd/rts5229.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,7 @@ static int rts5229_card_power_on(struct rtsx_pcr *pcr, int card)
SD_POWER_MASK, SD_POWER_ON);
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PWR_GATE_CTRL,
LDO3318_PWR_MASK, 0x06);
err = rtsx_pci_send_cmd(pcr, 100);
if (err < 0)
return err;

return 0;
return rtsx_pci_send_cmd(pcr, 100);
}

static int rts5229_card_power_off(struct rtsx_pcr *pcr, int card)
Expand Down
6 changes: 1 addition & 5 deletions drivers/mfd/rts5249.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,7 @@ static int rtsx_base_card_power_on(struct rtsx_pcr *pcr, int card)
SD_POWER_MASK, SD_VCC_POWER_ON);
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PWR_GATE_CTRL,
LDO3318_PWR_MASK, 0x06);
err = rtsx_pci_send_cmd(pcr, 100);
if (err < 0)
return err;

return 0;
return rtsx_pci_send_cmd(pcr, 100);
}

static int rtsx_base_card_power_off(struct rtsx_pcr *pcr, int card)
Expand Down
6 changes: 1 addition & 5 deletions drivers/mfd/rtsx_pcr.c
Original file line number Diff line number Diff line change
Expand Up @@ -571,11 +571,7 @@ static int rtsx_pci_set_pull_ctl(struct rtsx_pcr *pcr, const u32 *tbl)
tbl++;
}

err = rtsx_pci_send_cmd(pcr, 100);
if (err < 0)
return err;

return 0;
return rtsx_pci_send_cmd(pcr, 100);
}

int rtsx_pci_card_pull_ctl_enable(struct rtsx_pcr *pcr, int card)
Expand Down

0 comments on commit b158b69

Please sign in to comment.