* [PATCH] x86/NUMA: cleanup
@ 2015-10-13 12:29 Jan Beulich
2015-10-13 13:29 ` Andrew Cooper
0 siblings, 1 reply; 2+ messages in thread
From: Jan Beulich @ 2015-10-13 12:29 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Keir Fraser
[-- Attachment #1: Type: text/plain, Size: 3731 bytes --]
- constification
- prefer container_of() over casts
- check original pointer against NULL instead of the container_of()
result
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/srat.c
+++ b/xen/arch/x86/srat.c
@@ -205,7 +205,7 @@ void __init acpi_numa_slit_init(struct a
/* Callback for Proximity Domain -> x2APIC mapping */
void __init
-acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
+acpi_numa_x2apic_affinity_init(const struct acpi_srat_x2apic_cpu_affinity *pa)
{
unsigned pxm;
nodeid_t node;
@@ -241,7 +241,7 @@ acpi_numa_x2apic_affinity_init(struct ac
/* Callback for Proximity Domain -> LAPIC mapping */
void __init
-acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
+acpi_numa_processor_affinity_init(const struct acpi_srat_cpu_affinity *pa)
{
unsigned pxm;
nodeid_t node;
@@ -276,7 +276,7 @@ acpi_numa_processor_affinity_init(struct
/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
void __init
-acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
+acpi_numa_memory_affinity_init(const struct acpi_srat_mem_affinity *ma)
{
u64 start, end;
unsigned pxm;
--- a/xen/drivers/acpi/numa.c
+++ b/xen/drivers/acpi/numa.c
@@ -124,10 +124,11 @@ static int __init
acpi_parse_x2apic_affinity(struct acpi_subtable_header *header,
const unsigned long end)
{
- struct acpi_srat_x2apic_cpu_affinity *processor_affinity;
+ const struct acpi_srat_x2apic_cpu_affinity *processor_affinity
+ = container_of(header, struct acpi_srat_x2apic_cpu_affinity,
+ header);
- processor_affinity = (struct acpi_srat_x2apic_cpu_affinity *)header;
- if (!processor_affinity)
+ if (!header)
return -EINVAL;
acpi_table_print_srat_entry(header);
@@ -139,13 +140,13 @@ acpi_parse_x2apic_affinity(struct acpi_s
}
static int __init
-acpi_parse_processor_affinity(struct acpi_subtable_header * header,
+acpi_parse_processor_affinity(struct acpi_subtable_header *header,
const unsigned long end)
{
- struct acpi_srat_cpu_affinity *processor_affinity
+ const struct acpi_srat_cpu_affinity *processor_affinity
= container_of(header, struct acpi_srat_cpu_affinity, header);
- if (!processor_affinity)
+ if (!header)
return -EINVAL;
acpi_table_print_srat_entry(header);
@@ -157,13 +158,13 @@ acpi_parse_processor_affinity(struct acp
}
static int __init
-acpi_parse_memory_affinity(struct acpi_subtable_header * header,
+acpi_parse_memory_affinity(struct acpi_subtable_header *header,
const unsigned long end)
{
- struct acpi_srat_mem_affinity *memory_affinity
+ const struct acpi_srat_mem_affinity *memory_affinity
= container_of(header, struct acpi_srat_mem_affinity, header);
- if (!memory_affinity)
+ if (!header)
return -EINVAL;
acpi_table_print_srat_entry(header);
--- a/xen/include/xen/acpi.h
+++ b/xen/include/xen/acpi.h
@@ -76,9 +76,9 @@ void acpi_table_print_srat_entry (struct
/* the following four functions are architecture-dependent */
void acpi_numa_slit_init (struct acpi_table_slit *slit);
-void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);
-void acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa);
-void acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma);
+void acpi_numa_processor_affinity_init(const struct acpi_srat_cpu_affinity *);
+void acpi_numa_x2apic_affinity_init(const struct acpi_srat_x2apic_cpu_affinity *);
+void acpi_numa_memory_affinity_init(const struct acpi_srat_mem_affinity *);
void acpi_numa_arch_fixup(void);
#ifdef CONFIG_ACPI_HOTPLUG_CPU
[-- Attachment #2: x86-SRAT-cleanup.patch --]
[-- Type: text/plain, Size: 3746 bytes --]
x86/NUMA: cleanup
- constification
- prefer container_of() over casts
- check original pointer against NULL instead of the container_of()
result
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/srat.c
+++ b/xen/arch/x86/srat.c
@@ -205,7 +205,7 @@ void __init acpi_numa_slit_init(struct a
/* Callback for Proximity Domain -> x2APIC mapping */
void __init
-acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
+acpi_numa_x2apic_affinity_init(const struct acpi_srat_x2apic_cpu_affinity *pa)
{
unsigned pxm;
nodeid_t node;
@@ -241,7 +241,7 @@ acpi_numa_x2apic_affinity_init(struct ac
/* Callback for Proximity Domain -> LAPIC mapping */
void __init
-acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
+acpi_numa_processor_affinity_init(const struct acpi_srat_cpu_affinity *pa)
{
unsigned pxm;
nodeid_t node;
@@ -276,7 +276,7 @@ acpi_numa_processor_affinity_init(struct
/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
void __init
-acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
+acpi_numa_memory_affinity_init(const struct acpi_srat_mem_affinity *ma)
{
u64 start, end;
unsigned pxm;
--- a/xen/drivers/acpi/numa.c
+++ b/xen/drivers/acpi/numa.c
@@ -124,10 +124,11 @@ static int __init
acpi_parse_x2apic_affinity(struct acpi_subtable_header *header,
const unsigned long end)
{
- struct acpi_srat_x2apic_cpu_affinity *processor_affinity;
+ const struct acpi_srat_x2apic_cpu_affinity *processor_affinity
+ = container_of(header, struct acpi_srat_x2apic_cpu_affinity,
+ header);
- processor_affinity = (struct acpi_srat_x2apic_cpu_affinity *)header;
- if (!processor_affinity)
+ if (!header)
return -EINVAL;
acpi_table_print_srat_entry(header);
@@ -139,13 +140,13 @@ acpi_parse_x2apic_affinity(struct acpi_s
}
static int __init
-acpi_parse_processor_affinity(struct acpi_subtable_header * header,
+acpi_parse_processor_affinity(struct acpi_subtable_header *header,
const unsigned long end)
{
- struct acpi_srat_cpu_affinity *processor_affinity
+ const struct acpi_srat_cpu_affinity *processor_affinity
= container_of(header, struct acpi_srat_cpu_affinity, header);
- if (!processor_affinity)
+ if (!header)
return -EINVAL;
acpi_table_print_srat_entry(header);
@@ -157,13 +158,13 @@ acpi_parse_processor_affinity(struct acp
}
static int __init
-acpi_parse_memory_affinity(struct acpi_subtable_header * header,
+acpi_parse_memory_affinity(struct acpi_subtable_header *header,
const unsigned long end)
{
- struct acpi_srat_mem_affinity *memory_affinity
+ const struct acpi_srat_mem_affinity *memory_affinity
= container_of(header, struct acpi_srat_mem_affinity, header);
- if (!memory_affinity)
+ if (!header)
return -EINVAL;
acpi_table_print_srat_entry(header);
--- a/xen/include/xen/acpi.h
+++ b/xen/include/xen/acpi.h
@@ -76,9 +76,9 @@ void acpi_table_print_srat_entry (struct
/* the following four functions are architecture-dependent */
void acpi_numa_slit_init (struct acpi_table_slit *slit);
-void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);
-void acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa);
-void acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma);
+void acpi_numa_processor_affinity_init(const struct acpi_srat_cpu_affinity *);
+void acpi_numa_x2apic_affinity_init(const struct acpi_srat_x2apic_cpu_affinity *);
+void acpi_numa_memory_affinity_init(const struct acpi_srat_mem_affinity *);
void acpi_numa_arch_fixup(void);
#ifdef CONFIG_ACPI_HOTPLUG_CPU
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] x86/NUMA: cleanup
2015-10-13 12:29 [PATCH] x86/NUMA: cleanup Jan Beulich
@ 2015-10-13 13:29 ` Andrew Cooper
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Cooper @ 2015-10-13 13:29 UTC (permalink / raw)
To: Jan Beulich, xen-devel; +Cc: Keir Fraser
On 13/10/15 13:29, Jan Beulich wrote:
> - constification
> - prefer container_of() over casts
> - check original pointer against NULL instead of the container_of()
> result
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-13 13:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-13 12:29 [PATCH] x86/NUMA: cleanup Jan Beulich
2015-10-13 13:29 ` Andrew Cooper
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.