Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

mmc: core: Replace the argument of mmc_sd_switch() with defines

Browse Source 
Replace with already defined values for readability. While at it, let's
also change the mode-parameter from an int to bool, as the only used values
are 0 or 1.

Signed-off-by: Chanwoo Lee <cw9316.lee@samsung.com>
Link: https://lore.kernel.org/r/20240829024709.402285-1-cw9316.lee@samsung.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Chanwoo Lee 2024-08-29 11:47:09 +09:00 committed by Ulf Hansson
parent 73abb1f16e
commit 4c0a6a0ac9
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mmc/core/sd.c
View File

@ -346,7 +346,7 @@ static int mmc_read_switch(struct mmc_card *card)
* The argument does not matter, as the support bits do not * The argument does not matter, as the support bits do not
* change with the arguments. * change with the arguments.
*/ */
err = mmc_sd_switch(card, 0, 0, 0, status); err = mmc_sd_switch(card, SD_SWITCH_CHECK, 0, 0, status);
if (err) { if (err) {
/* /*
* If the host or the card can't do the switch, * If the host or the card can't do the switch,
@ -402,7 +402,8 @@ int mmc_sd_switch_hs(struct mmc_card *card)
if (!status) if (!status)
return -ENOMEM; return -ENOMEM;
err = mmc_sd_switch(card, 1, 0, HIGH_SPEED_BUS_SPEED, status); err = mmc_sd_switch(card, SD_SWITCH_SET, 0,
HIGH_SPEED_BUS_SPEED, status);
if (err) if (err)
goto out; goto out;
@ -434,7 +435,8 @@ static int sd_select_driver_type(struct mmc_card *card, u8 *status)
card_drv_type, &drv_type); card_drv_type, &drv_type);
if (drive_strength) { if (drive_strength) {
err = mmc_sd_switch(card, 1, 2, drive_strength, status); err = mmc_sd_switch(card, SD_SWITCH_SET, 2,
drive_strength, status);
if (err) if (err)
return err; return err;
if ((status[15] & 0xF) != drive_strength) { if ((status[15] & 0xF) != drive_strength) {
@ -514,7 +516,7 @@ static int sd_set_bus_speed_mode(struct mmc_card *card, u8 *status)
return 0; return 0;
} }
err = mmc_sd_switch(card, 1, 0, card->sd_bus_speed, status); err = mmc_sd_switch(card, SD_SWITCH_SET, 0, card->sd_bus_speed, status);
if (err) if (err)
return err; return err;
@ -605,7 +607,8 @@ static int sd_set_current_limit(struct mmc_card *card, u8 *status)
current_limit = SD_SET_CURRENT_LIMIT_200; current_limit = SD_SET_CURRENT_LIMIT_200;
if (current_limit != SD_SET_CURRENT_NO_CHANGE) { if (current_limit != SD_SET_CURRENT_NO_CHANGE) {
err = mmc_sd_switch(card, 1, 3, current_limit, status); err = mmc_sd_switch(card, SD_SWITCH_SET, 3,
current_limit, status);
if (err) if (err)
return err; return err;

3
drivers/mmc/core/sd_ops.c
View File

@ -336,14 +336,13 @@ int mmc_app_send_scr(struct mmc_card *card)
return 0; return 0;
} }
int mmc_sd_switch(struct mmc_card *card, int mode, int group, int mmc_sd_switch(struct mmc_card *card, bool mode, int group,
u8 value, u8 *resp) u8 value, u8 *resp)
{ {
u32 cmd_args; u32 cmd_args;
/* NOTE: caller guarantees resp is heap-allocated */ /* NOTE: caller guarantees resp is heap-allocated */
mode = !!mode;
value &= 0xF; value &= 0xF;
cmd_args = mode << 31 | 0x00FFFFFF; cmd_args = mode << 31 | 0x00FFFFFF;
cmd_args &= ~(0xF << (group * 4)); cmd_args &= ~(0xF << (group * 4));

3
include/linux/mmc/host.h
View File

@ -648,7 +648,8 @@ static inline void mmc_debugfs_err_stats_inc(struct mmc_host *host,
host->err_stats[stat] += 1; host->err_stats[stat] += 1;
} }
int mmc_sd_switch(struct mmc_card *card, int mode, int group, u8 value, u8 *resp); int mmc_sd_switch(struct mmc_card *card, bool mode, int group,
u8 value, u8 *resp);
int mmc_send_status(struct mmc_card *card, u32 *status); int mmc_send_status(struct mmc_card *card, u32 *status);
int mmc_send_tuning(struct mmc_host *host, u32 opcode, int *cmd_error); int mmc_send_tuning(struct mmc_host *host, u32 opcode, int *cmd_error);
int mmc_send_abort_tuning(struct mmc_host *host, u32 opcode); int mmc_send_abort_tuning(struct mmc_host *host, u32 opcode);