From: matthew_minter <matthew_minter@xxxxxxxxxxx>
---
drivers/of/of_pci_irq.c | 2 +-
drivers/pci/setup-irq.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/of/of_pci_irq.c b/drivers/of/of_pci_irq.c
index 1710d9d..205eb7a 100644
--- a/drivers/of/of_pci_irq.c
+++ b/drivers/of/of_pci_irq.c
@@ -97,7 +97,7 @@ EXPORT_SYMBOL_GPL(of_irq_parse_pci);
* @pin: PCI irq pin number; passed when used as map_irq callback. Unused
*
* @slot and @pin are unused, but included in the function so that this
- * function can be used directly as the map_irq callback to pci_fixup_irqs().
+ * function can be used directly as the map_irq callback to pdev_assign_irq().
*/
int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
{
diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c
index 7bb4356..203bf7e 100644
--- a/drivers/pci/setup-irq.c
+++ b/drivers/pci/setup-irq.c
@@ -31,7 +31,7 @@ void pdev_assign_irq(struct pci_dev *dev,
int irq = 0;
if (!map_irq) {
- dev_dbg(&dev->dev, "map_irq not provided by arch\n", dev->irq);
+ dev_dbg(&dev->dev, "runtime irq mapping not provided by arch\n");
return;
}
@@ -46,7 +46,7 @@ void pdev_assign_irq(struct pci_dev *dev,
if (pin > 4)
pin = 1;
- if (pin != 0) {
+ if (pin) {
/* Follow the chain of bridges, swizzling as we go. */
if(swizzle)
slot = (*swizzle)(dev, &pin);
@@ -57,7 +57,7 @@ void pdev_assign_irq(struct pci_dev *dev,
irq = 0;
}
- dev_dbg(&dev->dev, "fixup irq: got %d\n", dev->irq);
+ dev_dbg(&dev->dev, "assign irq: got %d\n", dev->irq);
dev->irq = irq;
/* Always tell the device, so the driver knows what is
the real IRQ to use; the device does not use it. */
--
2.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
