Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 128099
b: refs/heads/master
c: 3b8249d
h: refs/heads/master
i:
  128097: 372ca9c
  128095: a2db82d
v: v3
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Dec 31, 2008
1 parent a4b5f7c commit 25311fb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 21a53283a012f21764f2aaaac9414849e1153d93
refs/heads/master: 3b8249de43ecf05407888c1ca6ca6e4945ff823c
18 changes: 0 additions & 18 deletions trunk/drivers/acpi/pci_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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).
Expand Down Expand Up @@ -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,
Expand All @@ -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.
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 25311fb

Please sign in to comment.