aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2007-04-05 17:19:10 +1000
committerGreg Kroah-Hartman <gregkh@suse.de>2007-05-02 19:02:37 -0700
commit4aa9bc955d61fdf03b5f9cee67db188fe1ffa8b7 (patch)
treebd0604f5d7308d63cafbb1e3134580e284d86a50 /include/linux
parentbab41e9be75121c473b00df2ffa33af3c44066a7 (diff)
downloadkernel_samsung_smdk4412-4aa9bc955d61fdf03b5f9cee67db188fe1ffa8b7.zip
kernel_samsung_smdk4412-4aa9bc955d61fdf03b5f9cee67db188fe1ffa8b7.tar.gz
kernel_samsung_smdk4412-4aa9bc955d61fdf03b5f9cee67db188fe1ffa8b7.tar.bz2
MSI: Use a list instead of the custom link structure
The msi descriptors are linked together with what looks a lot like a linked list, but isn't a struct list_head list. Make it one. The only complication is that previously we walked a list of irqs, and got the descriptor for each with get_irq_msi(). Now we have a list of descriptors and need to get the irq out of it, so it needs to be in the actual struct msi_desc. We use 0 to indicate no irq is setup. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/msi.h8
-rw-r--r--include/linux/pci.h1
2 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/msi.h b/include/linux/msi.h
index d2a2000..931e013 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -1,6 +1,8 @@
#ifndef LINUX_MSI_H
#define LINUX_MSI_H
+#include <linux/list.h>
+
struct msi_msg {
u32 address_lo; /* low 32 bits of msi message address */
u32 address_hi; /* high 32 bits of msi message address */
@@ -24,10 +26,8 @@ struct msi_desc {
unsigned default_irq; /* default pre-assigned irq */
}msi_attrib;
- struct {
- __u16 head;
- __u16 tail;
- }link;
+ unsigned int irq;
+ struct list_head list;
void __iomem *mask_base;
struct pci_dev *dev;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index c020747..d43097d 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -190,6 +190,7 @@ struct pci_dev {
struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */
#ifdef CONFIG_PCI_MSI
unsigned int first_msi_irq;
+ struct list_head msi_list;
#endif
};