i386/x86-64: Remove checks for value == NULL in PCI config space access
PATCH 5/7 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 <[email protected]>
--- arch/i386/pci/direct.c | 6 ++++-- arch/i386/pci/mmconfig.c | 2 +- arch/x86_64/pci/mmconfig.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-)
arch/i386/pci/direct.c +4 -2
@@ -19,7 +19,7 @@ int pci_conf1_read(unsigned int seg, uns {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 sunsigned 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);
arch/i386/pci/mmconfig.c +1 -1
@@ -80,7 +80,7 @@ static int pci_mmcfg_read(unsigned int sunsigned long flags;u32 base; -if (!value || (bus >255 ) || (devfn >255 ) || (reg >4095 )) { +if ((bus >255 ) || (devfn >255 ) || (reg >4095 )) { *value =-1 ;return -EINVAL ; }
arch/x86_64/pci/mmconfig.c +1 -1
@@ -75,7 +75,7 @@ static int pci_mmcfg_read(unsigned int schar __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 ; }