mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 03:48:59 +00:00
x86 cleanups for v6.13:
- x86/boot: Remove unused function atou() (Dr. David Alan Gilbert) - x86/cpu: Use str_yes_no() helper in show_cpuinfo_misc() (Thorsten Blum) - x86/platform: Switch back to struct platform_driver::remove() (Uwe Kleine-König) Signed-off-by: Ingo Molnar <mingo@kernel.org> -----BEGIN PGP SIGNATURE----- iQJFBAABCgAvFiEEBpT5eoXrXCwVQwEKEnMQ0APhK1gFAmc7gbsRHG1pbmdvQGtl cm5lbC5vcmcACgkQEnMQ0APhK1gk4g//QiV5NS8d5mc+6q/UbVahST5Mf3Yktg7/ LIgzJyqUMZctkbcASDbyTlFqZXGYfZ/ZY6VPEOuo0ANE57GfSbcuwe+gdvL9kXWQ 9IN5Tst4BJ4iMC+FXYA+VgRAg5Ufy4xJFpw1ObnNtAQ4f2emCTeCMPonCrN8x737 2dbHzgnJSBbDgG6lxcEJZ/PsoKoTLiq6uZZ98FRRrHCWmkPkNOn2IQx97ITdAKcj LnQkTYnTRIzap/eLBrqgxhhtM2R+3DrDClar3WWRSCoFMYg6c8aptidDBQcJhUKZ XIhb2enKBKFVtzahjPVOiqLE2i+JGGiPSyQnCpt7y2yHQUyDXkDWWMPdZKC/6WHf +2sLgEdl+pz2o3mGDMCkkG58bDgEf0+5gGva+M5F6h7GslYM9Gp0doOYZDt6l+FH 3rrmXj2WKwI2kM0SWDwfgdLhhmPEsIm8DMOjOftEfR0pwqyUw5JmPfD1dnudrPX0 wfpRavlUAzzW0IbWaL+S2VhqQnLhLwJ/T/Gb6Gi6LOkTaRuD42hu0tkctlfJ/VTR 7Bk+mV2PHpBek3gWnKEUegYQ9LK9DGIucvYi693MWjXVFN6vSyNEsaefRHbT2rGi QuLnO2Laecg6SGNBjLYJBWjv72H2CohDRuJdFgzzJAEzebLwdCJE79qjqWRhpKAx sEzSy0+6waw= =l+KH -----END PGP SIGNATURE----- Merge tag 'x86-cleanups-2024-11-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 cleanups from Ingo Molnar: - x86/boot: Remove unused function atou() (Dr. David Alan Gilbert) - x86/cpu: Use str_yes_no() helper in show_cpuinfo_misc() (Thorsten Blum) - x86/platform: Switch back to struct platform_driver::remove() (Uwe Kleine-König) * tag 'x86-cleanups-2024-11-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/boot: Remove unused function atou() x86/cpu: Use str_yes_no() helper in show_cpuinfo_misc() x86/platform: Switch back to struct platform_driver::remove()
This commit is contained in:
commit
89c45f3823
@ -305,7 +305,6 @@ void initregs(struct biosregs *regs);
|
||||
int strcmp(const char *str1, const char *str2);
|
||||
int strncmp(const char *cs, const char *ct, size_t count);
|
||||
size_t strnlen(const char *s, size_t maxlen);
|
||||
unsigned int atou(const char *s);
|
||||
unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base);
|
||||
size_t strlen(const char *s);
|
||||
char *strchr(const char *s, int c);
|
||||
|
@ -88,14 +88,6 @@ size_t strnlen(const char *s, size_t maxlen)
|
||||
return (es - s);
|
||||
}
|
||||
|
||||
unsigned int atou(const char *s)
|
||||
{
|
||||
unsigned int i = 0;
|
||||
while (isdigit(*s))
|
||||
i = i * 10 + (*s++ - '0');
|
||||
return i;
|
||||
}
|
||||
|
||||
/* Works only for digits and letters, but small and fast */
|
||||
#define TOLOWER(x) ((x) | 0x20)
|
||||
|
||||
|
@ -24,7 +24,6 @@ extern size_t strlen(const char *s);
|
||||
extern char *strstr(const char *s1, const char *s2);
|
||||
extern char *strchr(const char *s, int c);
|
||||
extern size_t strnlen(const char *s, size_t maxlen);
|
||||
extern unsigned int atou(const char *s);
|
||||
extern unsigned long long simple_strtoull(const char *cp, char **endp,
|
||||
unsigned int base);
|
||||
long simple_strtol(const char *cp, char **endp, unsigned int base);
|
||||
|
@ -41,11 +41,11 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)
|
||||
"fpu_exception\t: %s\n"
|
||||
"cpuid level\t: %d\n"
|
||||
"wp\t\t: yes\n",
|
||||
boot_cpu_has_bug(X86_BUG_FDIV) ? "yes" : "no",
|
||||
boot_cpu_has_bug(X86_BUG_F00F) ? "yes" : "no",
|
||||
boot_cpu_has_bug(X86_BUG_COMA) ? "yes" : "no",
|
||||
boot_cpu_has(X86_FEATURE_FPU) ? "yes" : "no",
|
||||
boot_cpu_has(X86_FEATURE_FPU) ? "yes" : "no",
|
||||
str_yes_no(boot_cpu_has_bug(X86_BUG_FDIV)),
|
||||
str_yes_no(boot_cpu_has_bug(X86_BUG_F00F)),
|
||||
str_yes_no(boot_cpu_has_bug(X86_BUG_COMA)),
|
||||
str_yes_no(boot_cpu_has(X86_FEATURE_FPU)),
|
||||
str_yes_no(boot_cpu_has(X86_FEATURE_FPU)),
|
||||
c->cpuid_level);
|
||||
}
|
||||
#else
|
||||
|
@ -73,7 +73,7 @@ static struct platform_driver iris_driver = {
|
||||
.name = "iris",
|
||||
},
|
||||
.probe = iris_probe,
|
||||
.remove_new = iris_remove,
|
||||
.remove = iris_remove,
|
||||
};
|
||||
|
||||
static struct resource iris_resources[] = {
|
||||
|
@ -159,7 +159,7 @@ static struct platform_driver cs5535_pms_driver = {
|
||||
.name = "cs5535-pms",
|
||||
},
|
||||
.probe = xo1_pm_probe,
|
||||
.remove_new = xo1_pm_remove,
|
||||
.remove = xo1_pm_remove,
|
||||
};
|
||||
|
||||
static struct platform_driver cs5535_acpi_driver = {
|
||||
@ -167,7 +167,7 @@ static struct platform_driver cs5535_acpi_driver = {
|
||||
.name = "olpc-xo1-pm-acpi",
|
||||
},
|
||||
.probe = xo1_pm_probe,
|
||||
.remove_new = xo1_pm_remove,
|
||||
.remove = xo1_pm_remove,
|
||||
};
|
||||
|
||||
static int __init xo1_pm_init(void)
|
||||
|
@ -616,7 +616,7 @@ static struct platform_driver xo1_sci_driver = {
|
||||
.dev_groups = lid_groups,
|
||||
},
|
||||
.probe = xo1_sci_probe,
|
||||
.remove_new = xo1_sci_remove,
|
||||
.remove = xo1_sci_remove,
|
||||
.suspend = xo1_sci_suspend,
|
||||
.resume = xo1_sci_resume,
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user