Skip to content

Commit 1fddf1d

Browse files
KAGA-KOKOhansendc
authored andcommitted
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)
1 parent d8666cf commit 1fddf1d

6 files changed

Lines changed: 0 additions & 13 deletions

File tree

arch/x86/kernel/apic/apic_flat_64.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ static struct apic apic_flat __ro_after_init = {
8787

8888
.disable_esr = 0,
8989

90-
.check_apicid_used = NULL,
9190
.init_apic_ldr = default_init_apic_ldr,
92-
.ioapic_phys_id_map = NULL,
9391
.cpu_present_to_apicid = default_cpu_present_to_apicid,
9492
.phys_pkg_id = flat_phys_pkg_id,
9593

arch/x86/kernel/apic/apic_noop.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ static void noop_apic_write(u32 reg, u32 val)
6565
struct apic apic_noop __ro_after_init = {
6666
.name = "noop",
6767
.probe = noop_probe,
68-
.acpi_madt_oem_check = NULL,
6968

7069
.delivery_mode = APIC_DELIVERY_MODE_FIXED,
7170
.dest_mode_logical = true,
@@ -80,7 +79,6 @@ struct apic apic_noop __ro_after_init = {
8079

8180
.max_apic_id = 0xFE,
8281
.get_apic_id = noop_get_apic_id,
83-
.set_apic_id = NULL,
8482

8583
.calc_dest_apicid = apic_flat_calc_apicid,
8684

arch/x86/kernel/apic/apic_numachip.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,6 @@ static const struct apic apic_numachip1 __refconst = {
227227

228228
.disable_esr = 0,
229229

230-
.check_apicid_used = NULL,
231-
.ioapic_phys_id_map = NULL,
232230
.cpu_present_to_apicid = default_cpu_present_to_apicid,
233231
.phys_pkg_id = numachip_phys_pkg_id,
234232

@@ -266,8 +264,6 @@ static const struct apic apic_numachip2 __refconst = {
266264

267265
.disable_esr = 0,
268266

269-
.check_apicid_used = NULL,
270-
.ioapic_phys_id_map = NULL,
271267
.cpu_present_to_apicid = default_cpu_present_to_apicid,
272268
.phys_pkg_id = numachip_phys_pkg_id,
273269

arch/x86/kernel/apic/probe_32.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ static struct apic apic_default __ro_after_init = {
4848

4949
.max_apic_id = 0xFE,
5050
.get_apic_id = default_get_apic_id,
51-
.set_apic_id = NULL,
5251

5352
.calc_dest_apicid = apic_flat_calc_apicid,
5453

arch/x86/kernel/apic/x2apic_phys.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,6 @@ static struct apic apic_x2apic_phys __ro_after_init = {
150150

151151
.disable_esr = 0,
152152

153-
.check_apicid_used = NULL,
154-
.ioapic_phys_id_map = NULL,
155153
.cpu_present_to_apicid = default_cpu_present_to_apicid,
156154
.phys_pkg_id = x2apic_phys_pkg_id,
157155

arch/x86/kernel/apic/x2apic_uv_x.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -811,8 +811,6 @@ static struct apic apic_x2apic_uv_x __ro_after_init = {
811811

812812
.disable_esr = 0,
813813

814-
.check_apicid_used = NULL,
815-
.ioapic_phys_id_map = NULL,
816814
.cpu_present_to_apicid = default_cpu_present_to_apicid,
817815
.phys_pkg_id = uv_phys_pkg_id,
818816

0 commit comments

Comments
 (0)