]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
x86: Mark device_nb as static and fix NULL noise
authorJaswinder Singh Rajput <jaswinder@kernel.org>
Wed, 1 Jul 2009 14:23:14 +0000 (19:53 +0530)
committerIngo Molnar <mingo@elte.hu>
Wed, 1 Jul 2009 14:52:53 +0000 (16:52 +0200)
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 addresses 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 a NULL
pointer. change 0 to NULL to fix that - this also address the
sparse warning.

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Cc: Joerg Roedel <joerg.roedel@amd.com>
LKML-Reference: <1246458194.6940.20.camel@hpdv5.satnam>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/amd_iommu.c

index 9372f0406ad4a51d654ce2a1dae5c41f7b3bf48e..6c99f5037801302fc60da447ce414a3179fad3eb 100644 (file)
@@ -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);