x86/apic: Remove pointless NULL initializations

Wasted space for no value.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Sohil Mehta <sohil.mehta@intel.com>
Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)

diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 1e268a0..f65419d 100644 (file)
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -87,9 +87,7 @@ static struct apic apic_flat __ro_after_init = {
 
        .disable_esr                    = 0,
 
-       .check_apicid_used              = NULL,
        .init_apic_ldr                  = default_init_apic_ldr,
-       .ioapic_phys_id_map             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = flat_phys_pkg_id,
 

diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index bd6a95c..28b693b 100644 (file)
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -65,7 +65,6 @@ static void noop_apic_write(u32 reg, u32 val)
 struct apic apic_noop __ro_after_init = {
        .name                           = "noop",
        .probe                          = noop_probe,
-       .acpi_madt_oem_check            = NULL,
 
        .delivery_mode                  = APIC_DELIVERY_MODE_FIXED,
        .dest_mode_logical              = true,
@@ -80,7 +79,6 @@ struct apic apic_noop __ro_after_init = {
 
        .max_apic_id                    = 0xFE,
        .get_apic_id                    = noop_get_apic_id,
-       .set_apic_id                    = NULL,
 
        .calc_dest_apicid               = apic_flat_calc_apicid,
 

diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index 39ebe1a..9df0187 100644 (file)
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -227,8 +227,6 @@ static const struct apic apic_numachip1 __refconst = {
 
        .disable_esr                    = 0,
 
-       .check_apicid_used              = NULL,
-       .ioapic_phys_id_map             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = numachip_phys_pkg_id,
 
@@ -266,8 +264,6 @@ static const struct apic apic_numachip2 __refconst = {
 
        .disable_esr                    = 0,
 
-       .check_apicid_used              = NULL,
-       .ioapic_phys_id_map             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = numachip_phys_pkg_id,
 

diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index d9f52f2..5facf42 100644 (file)
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -48,7 +48,6 @@ static struct apic apic_default __ro_after_init = {
 
        .max_apic_id                    = 0xFE,
        .get_apic_id                    = default_get_apic_id,
-       .set_apic_id                    = NULL,
 
        .calc_dest_apicid               = apic_flat_calc_apicid,
 

diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index fcb96b9..47ee5c6 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -150,8 +150,6 @@ static struct apic apic_x2apic_phys __ro_after_init = {
 
        .disable_esr                    = 0,
 
-       .check_apicid_used              = NULL,
-       .ioapic_phys_id_map             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = x2apic_phys_pkg_id,
 

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 26891ac..5692514 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -811,8 +811,6 @@ static struct apic apic_x2apic_uv_x __ro_after_init = {
 
        .disable_esr                    = 0,
 
-       .check_apicid_used              = NULL,
-       .ioapic_phys_id_map             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = uv_phys_pkg_id,