Commit 1c74a93c authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'samsung-soc-5.20' of...

Merge tag 'samsung-soc-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc

Samsung mach/soc changes for v5.20

1. Use preferred strscpy() over strlcpy().
2. Kconfig indentation cleanup.

* tag 'samsung-soc-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: s3c: Kconfig.s3c64xx: Fix indentation
  ARM: s3c: Kconfig.s3c24xx: Fix indentation and replace some tabs
  ARM: s3c: Kconfig: Fix indentation
  ARM: s3c: Use strscpy to replace strlcpy

Link: https://lore.kernel.org/r/20220624080746.31947-3-krzysztof.kozlowski@linaro.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 03c765b0 d1065293
...@@ -37,8 +37,6 @@ config PLAT_S3C24XX ...@@ -37,8 +37,6 @@ config PLAT_S3C24XX
help help
Base platform code for any Samsung S3C24XX device Base platform code for any Samsung S3C24XX device
menu "Samsung S3C24XX SoCs Support" menu "Samsung S3C24XX SoCs Support"
comment "S3C24XX SoCs" comment "S3C24XX SoCs"
...@@ -444,7 +442,7 @@ config S3C2440_PLL_16934400 ...@@ -444,7 +442,7 @@ config S3C2440_PLL_16934400
default y if S3C24XX_PLL default y if S3C24XX_PLL
help help
PLL tables for S3C2440 or S3C2442 CPUs with 16.934MHz crystals. PLL tables for S3C2440 or S3C2442 CPUs with 16.934MHz crystals.
endif endif # CPU_S3C2440 || CPU_S3C2442
if CPU_S3C2440 if CPU_S3C2440
...@@ -601,6 +599,6 @@ config PM_H1940 ...@@ -601,6 +599,6 @@ config PM_H1940
help help
Internal node for H1940 and related PM Internal node for H1940 and related PM
endmenu # Samsung S3C24XX SoCs Support endmenu # "Samsung S3C24XX SoCs Support"
endif # ARCH_S3C24XX endif # ARCH_S3C24XX
...@@ -624,7 +624,7 @@ static char mini2440_features_str[12] __initdata = "0tb"; ...@@ -624,7 +624,7 @@ static char mini2440_features_str[12] __initdata = "0tb";
static int __init mini2440_features_setup(char *str) static int __init mini2440_features_setup(char *str)
{ {
if (str) if (str)
strlcpy(mini2440_features_str, str, strscpy(mini2440_features_str, str,
sizeof(mini2440_features_str)); sizeof(mini2440_features_str));
return 1; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment