[PATCH] i386/x86-64: Remove checks for value == NULL in PCI config space access

Nobody should pass NULL here. Could in theory make it a BUG,
but the NULL pointer oops will do as well.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/i386/pci/direct.c b/arch/i386/pci/direct.c
index 0659ced01185201bc4a6d323217a284cb153cc3a..5d81fb51037551b9ede92c2f0f7f785a2a6e4e2e 100644 (file)
--- a/arch/i386/pci/direct.c
+++ b/arch/i386/pci/direct.c
@@ -19,7 +19,7 @@ int pci_conf1_read(unsigned int seg, unsigned int bus,
 {
        unsigned long flags;
 
-       if (!value || (bus > 255) || (devfn > 255) || (reg > 255)) {
+       if ((bus > 255) || (devfn > 255) || (reg > 255)) {
                *value = -1;
                return -EINVAL;
        }
@@ -94,8 +94,10 @@ static int pci_conf2_read(unsigned int seg, unsigned int bus,
        unsigned long flags;
        int dev, fn;
 
-       if (!value || (bus > 255) || (devfn > 255) || (reg > 255))
+       if ((bus > 255) || (devfn > 255) || (reg > 255)) {
+               *value = -1;
                return -EINVAL;
+       }
 
        dev = PCI_SLOT(devfn);
        fn = PCI_FUNC(devfn);

diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index f77d7f8b9bf6ca53f4536e5a1d38a1135c3e2d58..6b1ea0c9a570ef7e142668dd03bc6b49a471d020 100644 (file)
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
@@ -80,7 +80,7 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
        unsigned long flags;
        u32 base;
 
-       if (!value || (bus > 255) || (devfn > 255) || (reg > 4095)) {
+       if ((bus > 255) || (devfn > 255) || (reg > 4095)) {
                *value = -1;
                return -EINVAL;
        }

diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c
index b493ed977e7c1e8248150d2d01eda527116c2134..1a59a31bb7406d48445da0c9eb392281e1fb9827 100644 (file)
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
@@ -75,7 +75,7 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
        char __iomem *addr;
 
        /* Why do we have this when nobody checks it. How about a BUG()!? -AK */
-       if (unlikely(!value || (bus > 255) || (devfn > 255) || (reg > 4095))) {
+       if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) {
                *value = -1;
                return -EINVAL;
        }