diff options
author | Jiang Liu <jiang.liu@linux.intel.com> | 2015-06-01 04:05:43 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-09-16 09:46:49 -0400 |
commit | b237721c5d95082a803c0be686f56d2dd1de995b (patch) | |
tree | fcaec3ce10ca018ef4b73860347fe421277bd399 /kernel/irq/irqdesc.c | |
parent | 9df872faa7e1619e9278bec00ceaed2236533530 (diff) |
genirq: Move field 'msi_desc' from irq_data into irq_common_data
MSI descriptors are per-irq instead of per irqchip, so move it into
struct irq_common_data.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Link: http://lkml.kernel.org/r/1433145945-789-35-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/irqdesc.c')
-rw-r--r-- | kernel/irq/irqdesc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index bb48a5c1964e..596669436f7a 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c | |||
@@ -74,12 +74,12 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node, | |||
74 | int cpu; | 74 | int cpu; |
75 | 75 | ||
76 | desc->irq_common_data.handler_data = NULL; | 76 | desc->irq_common_data.handler_data = NULL; |
77 | desc->irq_common_data.msi_desc = NULL; | ||
77 | 78 | ||
78 | desc->irq_data.common = &desc->irq_common_data; | 79 | desc->irq_data.common = &desc->irq_common_data; |
79 | desc->irq_data.irq = irq; | 80 | desc->irq_data.irq = irq; |
80 | desc->irq_data.chip = &no_irq_chip; | 81 | desc->irq_data.chip = &no_irq_chip; |
81 | desc->irq_data.chip_data = NULL; | 82 | desc->irq_data.chip_data = NULL; |
82 | desc->irq_data.msi_desc = NULL; | ||
83 | irq_settings_clr_and_set(desc, ~0, _IRQ_DEFAULT_INIT_FLAGS); | 83 | irq_settings_clr_and_set(desc, ~0, _IRQ_DEFAULT_INIT_FLAGS); |
84 | irqd_set(&desc->irq_data, IRQD_IRQ_DISABLED); | 84 | irqd_set(&desc->irq_data, IRQD_IRQ_DISABLED); |
85 | desc->handle_irq = handle_bad_irq; | 85 | desc->handle_irq = handle_bad_irq; |