Subject: [PATCH 2/5] Introduce PCI_NO_IRQ and pci_valid_irq()
Explicitly initialise pci_dev->irq with PCI_NO_IRQ, allowing us to change the value of PCI_NO_IRQ once all drivers have been audited.
---
drivers/pci/probe.c | 7 +++++-- include/linux/pci.h | 9 +++++++++ 2 files changed, 14 insertions(+), 2 deletions(-)
applies-to: 48ad7d3f9b055a9d4c1a1ab1f6dd0a584cfed99c 53424f050aff8200f80f4d3edf9af7b7f085e6f6
drivers/pci/probe.c +5 -2
@@ -571,9 +571,12 @@ static void pci_read_irq(struct pci_devunsigned char irq;pci_read_config_byte (dev,PCI_INTERRUPT_PIN , &irq); -if (irq) +if (irq) {pci_read_config_byte (dev,PCI_INTERRUPT_LINE , &irq); - dev->irq = irq; + dev->irq = irq; + }else { + dev->irq =PCI_NO_IRQ ; + } }/**
include/linux/pci.h +9 -0
@@ -140,6 +140,15 @@ struct pci_dev {struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE ];/* sysfs file for resources */ }; +/* +* The PCI subsystem has traditionally filled in 0 when no interrupt has been +* assigned. While we should move to using NO_IRQ instead, many drivers +* remain to be converted. Once all drivers are using PCI_NO_IRQ, switching +* over should be a simple search-and-replace. +*/ +#define PCI_NO_IRQ 0 +#define pci_valid_irq (irq) (irq != PCI_NO_IRQ) +#define pci_dev_g (n) list_entry(n, struct pci_dev, global_list)#define pci_dev_b (n) list_entry(n, struct pci_dev, bus_list)#define to_pci_dev (n) container_of(n, struct pci_dev, dev)
---
0.99.8.GIT
Re: [PATCH 2/5] Introduce PCI_NO_IRQ and pci_valid_irq()
Quoted 2 lines · Matthew Wilcox
Explicitly initialise
pci_dev->irqwithPCI_NO_IRQ, allowing us to change the value ofPCI_NO_IRQonce all drivers have been audited.
And what will the value of PCI_NO_IRQ going to be?
thanks,
greg k-h
Re: [PATCH 2/5] Introduce PCI_NO_IRQ and pci_valid_irq()
Quoted 5 lines · Greg KH
Quoted 2 lines · Matthew Wilcox
Explicitly initialise
pci_dev->irqwithPCI_NO_IRQ, allowing us to change the value ofPCI_NO_IRQonce all drivers have been audited.And what will the value of
PCI_NO_IRQgoing to be?
It's actually going to go away; s/PCI_NO_IRQ/NO_IRQ/g. I didn't want to break all the drivers immediately.