Messages in this thread Patch in this message | | | Date | Thu, 10 Feb 2022 11:09:56 -0000 | From | "irqchip-bot for Marc Zyngier" <> | Subject | [irqchip: irq/irqchip-next] genirq: Kill irq_chip::parent_device |
| |
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: beb0622138cd2848dec06b0651a988c39d099574 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/beb0622138cd2848dec06b0651a988c39d099574 Author: Marc Zyngier <maz@kernel.org> AuthorDate: Tue, 01 Feb 2022 12:03:10 Committer: Marc Zyngier <maz@kernel.org> CommitterDate: Thu, 10 Feb 2022 11:07:04
genirq: Kill irq_chip::parent_device
Now that noone is using irq_chip::parent_device in the tree, get rid of it.
Signed-off-by: Marc Zyngier <maz@kernel.org> Acked-by: Bartosz Golaszewski <brgl@bgdev.pl> Link: https://lore.kernel.org/r/20220201120310.878267-13-maz@kernel.org --- include/linux/irq.h | 2 -- kernel/irq/chip.c | 3 --- 2 files changed, 5 deletions(-)
diff --git a/include/linux/irq.h b/include/linux/irq.h index 848e1e1..2cb2e2a 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -456,7 +456,6 @@ static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d) /** * struct irq_chip - hardware interrupt chip descriptor * - * @parent_device: pointer to parent device for irqchip * @name: name for /proc/interrupts * @irq_startup: start up the interrupt (defaults to ->enable if NULL) * @irq_shutdown: shut down the interrupt (defaults to ->disable if NULL) @@ -503,7 +502,6 @@ static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d) * @flags: chip specific flags */ struct irq_chip { - struct device *parent_device; const char *name; unsigned int (*irq_startup)(struct irq_data *data); void (*irq_shutdown)(struct irq_data *data); diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index a2a12cd..24b6f2b 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -1560,9 +1560,6 @@ int irq_chip_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) static struct device *irq_get_parent_device(struct irq_data *data) { - if (data->chip->parent_device) - return data->chip->parent_device; - if (data->domain) return data->domain->dev;
| |