Skip to contentSkip to conversation

x86: amd_iommu.c device_nb should be static

PATCH RESEND In review Jaswinder Singh Rajput 2 participants 3 messages Jul 1, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 x86: amd_iommu.c device_nb should be static

device_nb is used only by same file, it should be static.

Also fixed NULL pointer issue.

Fixed following sparse warnings :
arch/x86/kernel/amd_iommu.c:1195:23: warning: symbol 'device_nb' was not declared. Should it be static? arch/x86/kernel/amd_iommu.c:1766:10: warning: Using plain integer as NULL pointer

---
 arch/x86/kernel/amd_iommu.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/amd_iommu.c +2 -2
index 9372f04..6c99f50 100644
@@ -1192,7 +1192,7 @@ out:
 	return 0;
 }
 
-struct notifier_block device_nb = {
+static struct notifier_block device_nb = {
 	.notifier_call = device_change_notifier,
 };
 
@@ -1763,7 +1763,7 @@ static void *alloc_coherent(struct device *dev, size_t size,
 	flag |= __GFP_ZERO;
 	virt_addr = (void *)__get_free_pages(flag, get_order(size));
 	if (!virt_addr)
-		return 0;
+		return NULL;
 
 	paddr = virt_to_phys(virt_addr);
 
Signature · 1 line
1.6.0.6
#1 lore raw
Quoted 8 lines · Jaswinder Singh Rajput

device_nb is used only by same file, it should be static.

Also fixed NULL pointer issue.

Fixed following sparse warnings :
arch/x86/kernel/amd_iommu.c:1195:23: warning: symbol 'device_nb' was not declared. Should it be static? arch/x86/kernel/amd_iommu.c:1766:10: warning: Using plain integer as NULL pointer

Mind resending this with a proper changelog, along the template of:

|  This Sparse warning:
|
|      arch/x86/kernel/amd_iommu.c...
|
|  triggers because <reason>. <do action> to fix that - this also
|  addresses the Sparse warning.

Where, in this current case:

<reason> := device_nb is global but is only used in a single .c file
<do action> := change device_nb to static

Please fill in the reason and action for the NULL fix as well.

Please write all similar warning fix commit log messages in a similar way in the future if you want me to apply them.

Thanks,

Ingo

#2 lore raw
Quoted 22 lines · Ingo Molnar
Quoted 8 lines · Jaswinder Singh Rajput

device_nb is used only by same file, it should be static.

Also fixed NULL pointer issue.

Fixed following sparse warnings :
arch/x86/kernel/amd_iommu.c:1195:23: warning: symbol 'device_nb' was not declared. Should it be static? arch/x86/kernel/amd_iommu.c:1766:10: warning: Using plain integer as NULL pointer

Mind resending this with a proper changelog, along the template of:

|  This Sparse warning:
|
|      arch/x86/kernel/amd_iommu.c...
|
|  triggers because <reason>. <do action> to fix that - this also
|  addresses the Sparse warning.

Where, in this current case:

Quoted 8 lines

<reason> := device_nb is global but is only used in a single .c file
<do action> := change device_nb to static

Please fill in the reason and action for the NULL fix as well.

Please write all similar warning fix commit log messages in a similar way in the future if you want me to apply them.

Please apply this :

[PATCH] x86: amd_iommu.c device_nb should be static

This sparse warning:

arch/x86/kernel/amd_iommu.c:1195:23: warning: symbol 'device_nb' was not declared. Should it be static?

triggers because device_nb is global but is only used in a single .c file. change device_nb to static to fix that - this also address the sparse warning.

This sparse warning:

arch/x86/kernel/amd_iommu.c:1766:10: warning: Using plain integer as NULL pointer

triggers because plain integer 0 is used in place of NULL pointer. change 0 to NULL to fix that - this also address the sparse warning.

---
 arch/x86/kernel/amd_iommu.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/amd_iommu.c +2 -2
index 9372f04..6c99f50 100644
@@ -1192,7 +1192,7 @@ out:
 	return 0;
 }
 
-struct notifier_block device_nb = {
+static struct notifier_block device_nb = {
 	.notifier_call = device_change_notifier,
 };
 
@@ -1763,7 +1763,7 @@ static void *alloc_coherent(struct device *dev, size_t size,
 	flag |= __GFP_ZERO;
 	virt_addr = (void *)__get_free_pages(flag, get_order(size));
 	if (!virt_addr)
-		return 0;
+		return NULL;
 
 	paddr = virt_to_phys(virt_addr);
 
Signature · 1 line
1.6.0.6