summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/pci_irq.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-12-09 05:30:10 +0100
committerLen Brown <len.brown@intel.com>2008-12-31 03:10:17 +0100
commit3b8249de43ecf05407888c1ca6ca6e4945ff823c (patch)
treeb3322f9072d24c58a9337953cce534cb6067610e /drivers/acpi/pci_irq.c
parentACPI: PCI: use conventional PCI address format (diff)
downloadlinux-3b8249de43ecf05407888c1ca6ca6e4945ff823c.tar.xz
linux-3b8249de43ecf05407888c1ca6ca6e4945ff823c.zip
ACPI: PCI: remove unnecessary null pointer checks
Better to oops and learn about a bug than to silently cover it up. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to '')
-rw-r--r--drivers/acpi/pci_irq.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 63a132609991..6c04060d063b 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -178,10 +178,6 @@ acpi_pci_irq_add_entry(acpi_handle handle,
{
struct acpi_prt_entry *entry = NULL;
-
- if (!prt)
- return -EINVAL;
-
entry = kzalloc(sizeof(struct acpi_prt_entry), GFP_KERNEL);
if (!entry)
return -ENOMEM;
@@ -432,9 +428,6 @@ acpi_pci_irq_derive(struct pci_dev *dev,
u8 bridge_pin = 0, orig_pin = pin;
- if (!dev)
- return -EINVAL;
-
/*
* Attempt to derive an IRQ for this device from a parent bridge's
* PCI interrupt routing entry (eg. yenta bridge and add-in card bridge).
@@ -491,9 +484,6 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
int rc;
- if (!dev)
- return -EINVAL;
-
pin = dev->pin;
if (!pin) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -503,11 +493,6 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
}
pin--;
- if (!dev->bus) {
- dev_err(&dev->dev, "invalid (NULL) 'bus' field\n");
- return -ENODEV;
- }
-
/*
* First we check the PCI IRQ routing table (PRT) for an IRQ. PRT
* values override any BIOS-assigned IRQs set during boot.
@@ -586,9 +571,6 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
int polarity = ACPI_ACTIVE_LOW;
- if (!dev || !dev->bus)
- return;
-
pin = dev->pin;
if (!pin)
return;