Skip to content

Commit 89c45f3

Browse files
committed
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()
2 parents 0892d74 + 97ecb26 commit 89c45f3

File tree

7 files changed

+9
-19
lines changed

7 files changed

+9
-19
lines changed

arch/x86/boot/boot.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ void initregs(struct biosregs *regs);
305305
int strcmp(const char *str1, const char *str2);
306306
int strncmp(const char *cs, const char *ct, size_t count);
307307
size_t strnlen(const char *s, size_t maxlen);
308-
unsigned int atou(const char *s);
309308
unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base);
310309
size_t strlen(const char *s);
311310
char *strchr(const char *s, int c);

arch/x86/boot/string.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,6 @@ size_t strnlen(const char *s, size_t maxlen)
8888
return (es - s);
8989
}
9090

91-
unsigned int atou(const char *s)
92-
{
93-
unsigned int i = 0;
94-
while (isdigit(*s))
95-
i = i * 10 + (*s++ - '0');
96-
return i;
97-
}
98-
9991
/* Works only for digits and letters, but small and fast */
10092
#define TOLOWER(x) ((x) | 0x20)
10193

arch/x86/boot/string.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ extern size_t strlen(const char *s);
2424
extern char *strstr(const char *s1, const char *s2);
2525
extern char *strchr(const char *s, int c);
2626
extern size_t strnlen(const char *s, size_t maxlen);
27-
extern unsigned int atou(const char *s);
2827
extern unsigned long long simple_strtoull(const char *cp, char **endp,
2928
unsigned int base);
3029
long simple_strtol(const char *cp, char **endp, unsigned int base);

arch/x86/kernel/cpu/proc.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)
4141
"fpu_exception\t: %s\n"
4242
"cpuid level\t: %d\n"
4343
"wp\t\t: yes\n",
44-
boot_cpu_has_bug(X86_BUG_FDIV) ? "yes" : "no",
45-
boot_cpu_has_bug(X86_BUG_F00F) ? "yes" : "no",
46-
boot_cpu_has_bug(X86_BUG_COMA) ? "yes" : "no",
47-
boot_cpu_has(X86_FEATURE_FPU) ? "yes" : "no",
48-
boot_cpu_has(X86_FEATURE_FPU) ? "yes" : "no",
44+
str_yes_no(boot_cpu_has_bug(X86_BUG_FDIV)),
45+
str_yes_no(boot_cpu_has_bug(X86_BUG_F00F)),
46+
str_yes_no(boot_cpu_has_bug(X86_BUG_COMA)),
47+
str_yes_no(boot_cpu_has(X86_FEATURE_FPU)),
48+
str_yes_no(boot_cpu_has(X86_FEATURE_FPU)),
4949
c->cpuid_level);
5050
}
5151
#else

arch/x86/platform/iris/iris.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static struct platform_driver iris_driver = {
7373
.name = "iris",
7474
},
7575
.probe = iris_probe,
76-
.remove_new = iris_remove,
76+
.remove = iris_remove,
7777
};
7878

7979
static struct resource iris_resources[] = {

arch/x86/platform/olpc/olpc-xo1-pm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,15 @@ static struct platform_driver cs5535_pms_driver = {
159159
.name = "cs5535-pms",
160160
},
161161
.probe = xo1_pm_probe,
162-
.remove_new = xo1_pm_remove,
162+
.remove = xo1_pm_remove,
163163
};
164164

165165
static struct platform_driver cs5535_acpi_driver = {
166166
.driver = {
167167
.name = "olpc-xo1-pm-acpi",
168168
},
169169
.probe = xo1_pm_probe,
170-
.remove_new = xo1_pm_remove,
170+
.remove = xo1_pm_remove,
171171
};
172172

173173
static int __init xo1_pm_init(void)

arch/x86/platform/olpc/olpc-xo1-sci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ static struct platform_driver xo1_sci_driver = {
616616
.dev_groups = lid_groups,
617617
},
618618
.probe = xo1_sci_probe,
619-
.remove_new = xo1_sci_remove,
619+
.remove = xo1_sci_remove,
620620
.suspend = xo1_sci_suspend,
621621
.resume = xo1_sci_resume,
622622
};

0 commit comments

Comments
 (0)