[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-b25ae679f613ed04aaf6ccbfdb9122fce668e4bb@git.kernel.org>
Date: Wed, 1 Jul 2009 14:54:35 GMT
From: tip-bot for Jaswinder Singh Rajput <jaswinder@...nel.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
joerg.roedel@....com, jaswinder@...nel.org,
jaswinderrajput@...il.com, tglx@...utronix.de, mingo@...e.hu
Subject: [tip:x86/urgent] x86: Mark device_nb as static and fix NULL noise
Commit-ID: b25ae679f613ed04aaf6ccbfdb9122fce668e4bb
Gitweb: http://git.kernel.org/tip/b25ae679f613ed04aaf6ccbfdb9122fce668e4bb
Author: Jaswinder Singh Rajput <jaswinder@...nel.org>
AuthorDate: Wed, 1 Jul 2009 19:53:14 +0530
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 1 Jul 2009 16:52:53 +0200
x86: Mark device_nb as static and fix NULL noise
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@...il.com>
Cc: Joerg Roedel <joerg.roedel@....com>
LKML-Reference: <1246458194.6940.20.camel@...v5.satnam>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/kernel/amd_iommu.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 9372f04..6c99f50 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists