mirror of
https://gitee.com/open-loongarch/linux-6.12.git
synced 2026-10-28 22:17:11 +08:00
update to 4249c4342540b1
mmc:Remove unused code to avoid compile warning loongson_2k300_defconfig:Don't builtin serio_xx
This commit is contained in:
@@ -505,8 +505,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
|
|||||||
CONFIG_TOUCHSCREEN_GOODIX=y
|
CONFIG_TOUCHSCREEN_GOODIX=y
|
||||||
CONFIG_INPUT_MISC=y
|
CONFIG_INPUT_MISC=y
|
||||||
CONFIG_INPUT_UINPUT=m
|
CONFIG_INPUT_UINPUT=m
|
||||||
CONFIG_SERIO_SERPORT=m
|
CONFIG_SERIO=m
|
||||||
CONFIG_SERIO_LIBPS2=y
|
CONFIG_SERIO_LIBPS2=m
|
||||||
CONFIG_SERIO_RAW=m
|
CONFIG_SERIO_RAW=m
|
||||||
CONFIG_LEGACY_PTY_COUNT=16
|
CONFIG_LEGACY_PTY_COUNT=16
|
||||||
CONFIG_SERIAL_8250=y
|
CONFIG_SERIAL_8250=y
|
||||||
|
|||||||
@@ -296,18 +296,20 @@ static void __init arch_reserve_crashkernel(void)
|
|||||||
static void* __init get_fdt_by_board_name(void)
|
static void* __init get_fdt_by_board_name(void)
|
||||||
{
|
{
|
||||||
void *fdt = NULL;
|
void *fdt = NULL;
|
||||||
char* board_name;
|
char *board_name = NULL;
|
||||||
char temp[128]; // 不想申请空间 应该不会有这么长的名字吧
|
char temp[128]; // 名字长度限定不超128
|
||||||
|
|
||||||
board_name = strstr(boot_command_line, board_name_desc);
|
board_name = strstr(boot_command_line, board_name_desc);
|
||||||
if (board_name) {
|
if (board_name) {
|
||||||
int i;
|
size_t max_len = sizeof(temp);
|
||||||
memset(temp, 0, 128);
|
memset(temp, 0, max_len);
|
||||||
|
max_len -= 1;
|
||||||
|
|
||||||
board_name += strlen(board_name_desc); // 跳过 = 和前面的字段
|
board_name += strlen(board_name_desc); // 跳过 = 和前面的字段
|
||||||
for (i = 0; i < 127; ++i) {
|
size_t len = strcspn(board_name, " ");
|
||||||
if (board_name[i] == 0 || board_name[i] == ' ')
|
len = len > max_len ? max_len : len;
|
||||||
break;
|
memcpy(temp, board_name, len);
|
||||||
temp[i] = board_name[i];
|
temp[len] = '\0';
|
||||||
}
|
|
||||||
board_name = temp;
|
board_name = temp;
|
||||||
}
|
}
|
||||||
if (board_name) {
|
if (board_name) {
|
||||||
@@ -834,20 +836,21 @@ static __init int parse_extlist(struct boot_params *bp)
|
|||||||
|
|
||||||
static int __init bp_start_match(void)
|
static int __init bp_start_match(void)
|
||||||
{
|
{
|
||||||
char* bp_start_value;
|
char *bp_start_value = NULL;
|
||||||
char temp[128]; // 不想申请空间 应该不会有这么长的值吧
|
char temp[128];
|
||||||
|
|
||||||
bp_start = 0;
|
bp_start = 0;
|
||||||
bp_start_value = strstr(boot_command_line, bp_start_desc);
|
bp_start_value = strstr(boot_command_line, bp_start_desc);
|
||||||
if (bp_start_value) {
|
if (bp_start_value) {
|
||||||
int i;
|
size_t max_len = sizeof(temp);
|
||||||
memset(temp, 0, 128);
|
memset(temp, 0, max_len);
|
||||||
|
max_len -= 1;
|
||||||
|
|
||||||
bp_start_value += strlen(bp_start_desc); // 跳过 = 和前面的字段
|
bp_start_value += strlen(bp_start_desc); // 跳过 = 和前面的字段
|
||||||
for (i = 0; i < 127; ++i) {
|
size_t len = strcspn(bp_start_value, " ");
|
||||||
if (bp_start_value[i] == 0 || bp_start_value[i] == ' ')
|
len = len > max_len ? max_len : len;
|
||||||
break;
|
memcpy(temp, bp_start_value, len);
|
||||||
temp[i] = bp_start_value[i];
|
temp[len] = '\0';
|
||||||
}
|
|
||||||
bp_start_value = temp;
|
bp_start_value = temp;
|
||||||
} else
|
} else
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
@@ -1033,7 +1033,6 @@ probe_free_host:
|
|||||||
static void ls2k_mci_shutdown(struct platform_device *pdev)
|
static void ls2k_mci_shutdown(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct mmc_host *mmc = platform_get_drvdata(pdev);
|
struct mmc_host *mmc = platform_get_drvdata(pdev);
|
||||||
struct ls2k_mci_host *host = mmc_priv(mmc);
|
|
||||||
|
|
||||||
if (mmc->caps & MMC_CAP_NONREMOVABLE)
|
if (mmc->caps & MMC_CAP_NONREMOVABLE)
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user