Commit 89c45f38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 0892d742 97ecb260

arch/x86/boot/boot.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/x86/boot/string.c

+0 −8
Original line number Diff line number Diff line
@@ -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)

arch/x86/boot/string.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/x86/kernel/cpu/proc.c

+5 −5
Original line number Diff line number Diff line
@@ -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

arch/x86/platform/iris/iris.c

+1 −1
Original line number Diff line number Diff line
@@ -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[] = {