From nobody Thu Nov 21 20:00:38 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2CA461DE4C2 for ; Mon, 18 Nov 2024 18:06:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731953165; cv=none; b=tAfL0DsVtPxX1rtQ1U9aExirYG+LghEZEyiXD1syhfQenS/xPj0am1WdVjSArjjXB8vuYRctfDfxfSaCPX7jStsdJ1zQ+vbIkg5IhzX7gDEhZlgyMXYPFEkcez9YZZ8PyOSMWL0kPR7N27GXb3+4V1aR50+7AV/tRAlgOeG8rn4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731953165; c=relaxed/simple; bh=n91wZ+7PwFH+sSTWFoRUfmXaR2aqfqaXieJskWgF8GM=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=Rg61VwXxCPPC8kCGswmmzOUHzR7HuqXkvaQ4kspQfvtlxFIPVFPQt8/aLm7H73TkByFWPJpXqhvA4tuZXSVb7oe4teTU2HQ78U6Jj28gs/UzglVyt0xU3gBjlfZPRS2R3FRlGFStafBd21TE8osv5V7mWzL5cqR8NjL7D7qNkG4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hiSYR/M/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hiSYR/M/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA58BC4CECC; Mon, 18 Nov 2024 18:06:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731953164; bh=n91wZ+7PwFH+sSTWFoRUfmXaR2aqfqaXieJskWgF8GM=; h=Date:From:To:Cc:Subject:From; b=hiSYR/M/UDkrx9lGnIKhkIiyVxcmQePGT1lQ17iO7RdZ2WxXX1xFmaeBlmL9/S6wT z4h485y6LfkDEGDUz4pYZmrszKPZbYBXo+a4fcjEpjJ9VNmyIu4DxyuZPaqKoJfMty 42cGJQo4AjcKGKL5EeRqnP39JndhY57N2otWFPzgIEXPugBdlW/Zk7lanjti4MCWFG btTXLVbF6VZ5TzhKug4cjpOiwqfEUgU7d1EnbgSzLc0YvTvzKWl+ItONBA8u8hxZRQ BNc8WyqxXyBvh/Uz+3AHvNFrWGtOmLdRnJnT1zdEC14ohd1pHEk2pQwmuIYPOPkncf PrubIp7uT8Cdg== Date: Mon, 18 Nov 2024 19:06:01 +0100 From: Ingo Molnar To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, the arch/x86 maintainers Subject: [GIT PULL] x86/cleanups for v6.13 Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Linus, Please pull the latest x86/cleanups Git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cleanups-2= 024-11-18 # HEAD: 97ecb260d9c19aa044871ae2c89408c340717b61 x86/boot: Remove unused= function atou() 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 Klei= ne-K=C3=B6nig) Thanks, Ingo ------------------> Dr. David Alan Gilbert (1): x86/boot: Remove unused function atou() Thorsten Blum (1): x86/cpu: Use str_yes_no() helper in show_cpuinfo_misc() Uwe Kleine-K=C3=B6nig (1): x86/platform: Switch back to struct platform_driver::remove() arch/x86/boot/boot.h | 1 - arch/x86/boot/string.c | 8 -------- arch/x86/boot/string.h | 1 - arch/x86/kernel/cpu/proc.c | 10 +++++----- arch/x86/platform/iris/iris.c | 2 +- arch/x86/platform/olpc/olpc-xo1-pm.c | 4 ++-- arch/x86/platform/olpc/olpc-xo1-sci.c | 2 +- 7 files changed, 9 insertions(+), 19 deletions(-) diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h index 148ba5c5106e..0f24f7ebec9b 100644 --- a/arch/x86/boot/boot.h +++ b/arch/x86/boot/boot.h @@ -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 i= nt base); size_t strlen(const char *s); char *strchr(const char *s, int c); diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c index c23f3b9c84fe..84f7a883ce1e 100644 --- a/arch/x86/boot/string.c +++ b/arch/x86/boot/string.c @@ -88,14 +88,6 @@ size_t strnlen(const char *s, size_t maxlen) return (es - s); } =20 -unsigned int atou(const char *s) -{ - unsigned int i =3D 0; - while (isdigit(*s)) - i =3D i * 10 + (*s++ - '0'); - return i; -} - /* Works only for digits and letters, but small and fast */ #define TOLOWER(x) ((x) | 0x20) =20 diff --git a/arch/x86/boot/string.h b/arch/x86/boot/string.h index e5d2c6b8c2f1..a5b05ebc037d 100644 --- a/arch/x86/boot/string.h +++ b/arch/x86/boot/string.h @@ -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); diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c index e65fae63660e..41ed01f46bd9 100644 --- a/arch/x86/kernel/cpu/proc.c +++ b/arch/x86/kernel/cpu/proc.c @@ -41,11 +41,11 @@ static void show_cpuinfo_misc(struct seq_file *m, struc= t 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 diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c index c5f3bbdbdcfe..5591a2d9cfe8 100644 --- a/arch/x86/platform/iris/iris.c +++ b/arch/x86/platform/iris/iris.c @@ -73,7 +73,7 @@ static struct platform_driver iris_driver =3D { .name =3D "iris", }, .probe =3D iris_probe, - .remove_new =3D iris_remove, + .remove =3D iris_remove, }; =20 static struct resource iris_resources[] =3D { diff --git a/arch/x86/platform/olpc/olpc-xo1-pm.c b/arch/x86/platform/olpc/= olpc-xo1-pm.c index 6a9c42de74e7..424eeae12759 100644 --- a/arch/x86/platform/olpc/olpc-xo1-pm.c +++ b/arch/x86/platform/olpc/olpc-xo1-pm.c @@ -159,7 +159,7 @@ static struct platform_driver cs5535_pms_driver =3D { .name =3D "cs5535-pms", }, .probe =3D xo1_pm_probe, - .remove_new =3D xo1_pm_remove, + .remove =3D xo1_pm_remove, }; =20 static struct platform_driver cs5535_acpi_driver =3D { @@ -167,7 +167,7 @@ static struct platform_driver cs5535_acpi_driver =3D { .name =3D "olpc-xo1-pm-acpi", }, .probe =3D xo1_pm_probe, - .remove_new =3D xo1_pm_remove, + .remove =3D xo1_pm_remove, }; =20 static int __init xo1_pm_init(void) diff --git a/arch/x86/platform/olpc/olpc-xo1-sci.c b/arch/x86/platform/olpc= /olpc-xo1-sci.c index 46d42ff6e18a..ccb23c73cbe8 100644 --- a/arch/x86/platform/olpc/olpc-xo1-sci.c +++ b/arch/x86/platform/olpc/olpc-xo1-sci.c @@ -616,7 +616,7 @@ static struct platform_driver xo1_sci_driver =3D { .dev_groups =3D lid_groups, }, .probe =3D xo1_sci_probe, - .remove_new =3D xo1_sci_remove, + .remove =3D xo1_sci_remove, .suspend =3D xo1_sci_suspend, .resume =3D xo1_sci_resume, };