x86/platform/uv: avoid unused variable warning
Subsystems (2)
PATCH 1/1 x86/platform/uv: avoid unused variable warning
When CONFIG_PROC_FS is disabled, the compiler warns about an unused variable:
arch/x86/kernel/apic/x2apic_uv_x.c: In function 'uv_setup_proc_files':arch/x86/kernel/apic/x2apic_uv_x.c:1546:8: error: unused variable 'name' [-Werror=unused-variable]
char *name = hubless ? "hubless" : "hubbed";
Simplify the code so this variable is no longer needed.
--- arch/x86/kernel/apic/x2apic_uv_x.c | 43 +++++------------------------- 1 file changed, 6 insertions(+), 37 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +6 -37
@@ -1493,65 +1493,34 @@ static void check_efi_reboot(void) }/* Setup user proc fs files */ -static int proc_hubbed_show (struct seq_file *file,void *data) +static int __maybe_unused proc_hubbed_show (struct seq_file *file,void *data) {seq_printf (file,"0x%x\n" , uv_hubbed_system);return 0 ; } -static int proc_hubless_show (struct seq_file *file,void *data) +static int __maybe_unused proc_hubless_show (struct seq_file *file,void *data) {seq_printf (file,"0x%x\n" , uv_hubless_system);return 0 ; } -static int proc_oemid_show (struct seq_file *file,void *data) +static int __maybe_unused proc_oemid_show (struct seq_file *file,void *data) {seq_printf (file,"%s/%s\n" , oem_id, oem_table_id);return 0 ; } -static int proc_hubbed_open (struct inode *inode,struct file *file) -{ -return single_open (file, proc_hubbed_show, (void *)NULL ); -} - -static int proc_hubless_open (struct inode *inode,struct file *file) -{ -return single_open (file, proc_hubless_show, (void *)NULL ); -} - -static int proc_oemid_open (struct inode *inode,struct file *file) -{ -return single_open (file, proc_oemid_show, (void *)NULL ); -} - -/* (struct is "non-const" as open function is set at runtime) */ -static struct file_operations proc_version_fops = { - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static const struct file_operations proc_oemid_fops = { - .open = proc_oemid_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; -static __init void uv_setup_proc_files (int hubless) {struct proc_dir_entry *pde; -char *name = hubless ?"hubless" :"hubbed" ; pde =proc_mkdir (UV_PROC_NODE ,NULL ); -proc_create ("oemid" ,0 , pde, &proc_oemid_fops); -proc_create (name,0 , pde, &proc_version_fops); +proc_create_single ("oemid" ,0 , pde, proc_oemid_show);if (hubless) - proc_version_fops.open = proc_hubless_open; +proc_create_single ("hubless" ,0 , pde, proc_hubless_show);else - proc_version_fops.open = proc_hubbed_open; +proc_create_single ("hubbed" ,0 , pde, proc_hubbed_show); }/* Initialize UV hubless systems */
Signature · 1 line
2.20.0
[tip: x86/apic] x86/apic/uv: Avoid unused variable warning
The following commit has been merged into the x86/apic branch of tip:
The following commit has been merged into the x86/apic branch of tip:
Commit-ID: d0b7788804482b2689946cd8d910ac3e03126c8d Gitweb: https://git.kernel.org/tip/d0b7788804482b2689946cd8d910ac3e03126c8d Author: Arnd Bergmann <[email protected]> AuthorDate: Thu, 12 Dec 2019 15:03:57 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 17 Jan 2020 14:34:41 +01:00
x86/apic/uv: Avoid unused variable warning
When CONFIG_PROC_FS is disabled, the compiler warns about an unused variable:
arch/x86/kernel/apic/x2apic_uv_x.c: In function 'uv_setup_proc_files':arch/x86/kernel/apic/x2apic_uv_x.c:1546:8: error: unused variable 'name' [-Werror=unused-variable]
char *name = hubless ? "hubless" : "hubbed";
Simplify the code so this variable is no longer needed.
--- arch/x86/kernel/apic/x2apic_uv_x.c | 43 ++++------------------------- 1 file changed, 6 insertions(+), 37 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +6 -37
@@ -1493,65 +1493,34 @@ static void check_efi_reboot(void) }/* Setup user proc fs files */ -static int proc_hubbed_show (struct seq_file *file,void *data) +static int __maybe_unused proc_hubbed_show (struct seq_file *file,void *data) {seq_printf (file,"0x%x\n" , uv_hubbed_system);return 0 ; } -static int proc_hubless_show (struct seq_file *file,void *data) +static int __maybe_unused proc_hubless_show (struct seq_file *file,void *data) {seq_printf (file,"0x%x\n" , uv_hubless_system);return 0 ; } -static int proc_oemid_show (struct seq_file *file,void *data) +static int __maybe_unused proc_oemid_show (struct seq_file *file,void *data) {seq_printf (file,"%s/%s\n" , oem_id, oem_table_id);return 0 ; } -static int proc_hubbed_open (struct inode *inode,struct file *file) -{ -return single_open (file, proc_hubbed_show, (void *)NULL ); -} - -static int proc_hubless_open (struct inode *inode,struct file *file) -{ -return single_open (file, proc_hubless_show, (void *)NULL ); -} - -static int proc_oemid_open (struct inode *inode,struct file *file) -{ -return single_open (file, proc_oemid_show, (void *)NULL ); -} - -/* (struct is "non-const" as open function is set at runtime) */ -static struct file_operations proc_version_fops = { - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static const struct file_operations proc_oemid_fops = { - .open = proc_oemid_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; -static __init void uv_setup_proc_files (int hubless) {struct proc_dir_entry *pde; -char *name = hubless ?"hubless" :"hubbed" ; pde =proc_mkdir (UV_PROC_NODE ,NULL ); -proc_create ("oemid" ,0 , pde, &proc_oemid_fops); -proc_create (name,0 , pde, &proc_version_fops); +proc_create_single ("oemid" ,0 , pde, proc_oemid_show);if (hubless) - proc_version_fops.open = proc_hubless_open; +proc_create_single ("hubless" ,0 , pde, proc_hubless_show);else - proc_version_fops.open = proc_hubbed_open; +proc_create_single ("hubbed" ,0 , pde, proc_hubbed_show); }/* Initialize UV hubless systems */