diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2017-12-29 10:59:06 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-12-29 15:13:04 -0500 |
commit | 702cb0a02813299d6911b775c637906ae21b737d (patch) | |
tree | afc29b040cc67d8b2efc4960d8bea0963895a388 /kernel/irq | |
parent | 945f50a591783ac6e9bd59694f34d1ba03b778a7 (diff) |
genirq/irqdomain: Rename early argument of irq_domain_activate_irq()
The 'early' argument of irq_domain_activate_irq() is actually used to
denote reservation mode. To avoid confusion, rename it before abuse
happens.
No functional change.
Fixes: 72491643469a ("genirq/irqdomain: Update irq_domain_ops.activate() signature")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Alexandru Chirvasitu <achirvasub@gmail.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Dou Liyang <douly.fnst@cn.fujitsu.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Cc: Mikael Pettersson <mikpelinux@gmail.com>
Cc: Josh Poulson <jopoulso@microsoft.com>
Cc: Mihai Costache <v-micos@microsoft.com>
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: linux-pci@vger.kernel.org
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Dexuan Cui <decui@microsoft.com>
Cc: Simon Xiao <sixiao@microsoft.com>
Cc: Saeed Mahameed <saeedm@mellanox.com>
Cc: Jork Loeser <Jork.Loeser@microsoft.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: devel@linuxdriverproject.org
Cc: KY Srinivasan <kys@microsoft.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Sakari Ailus <sakari.ailus@intel.com>,
Cc: linux-media@vger.kernel.org
Diffstat (limited to 'kernel/irq')
-rw-r--r-- | kernel/irq/internals.h | 2 | ||||
-rw-r--r-- | kernel/irq/irqdomain.c | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index 07d08ca701ec..ab19371eab9b 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h | |||
@@ -440,7 +440,7 @@ static inline bool irq_fixup_move_pending(struct irq_desc *desc, bool fclear) | |||
440 | #endif /* !CONFIG_GENERIC_PENDING_IRQ */ | 440 | #endif /* !CONFIG_GENERIC_PENDING_IRQ */ |
441 | 441 | ||
442 | #if !defined(CONFIG_IRQ_DOMAIN) || !defined(CONFIG_IRQ_DOMAIN_HIERARCHY) | 442 | #if !defined(CONFIG_IRQ_DOMAIN) || !defined(CONFIG_IRQ_DOMAIN_HIERARCHY) |
443 | static inline int irq_domain_activate_irq(struct irq_data *data, bool early) | 443 | static inline int irq_domain_activate_irq(struct irq_data *data, bool reserve) |
444 | { | 444 | { |
445 | irqd_set_activated(data); | 445 | irqd_set_activated(data); |
446 | return 0; | 446 | return 0; |
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 4f4f60015e8a..62068ad46930 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c | |||
@@ -1693,7 +1693,7 @@ static void __irq_domain_deactivate_irq(struct irq_data *irq_data) | |||
1693 | } | 1693 | } |
1694 | } | 1694 | } |
1695 | 1695 | ||
1696 | static int __irq_domain_activate_irq(struct irq_data *irqd, bool early) | 1696 | static int __irq_domain_activate_irq(struct irq_data *irqd, bool reserve) |
1697 | { | 1697 | { |
1698 | int ret = 0; | 1698 | int ret = 0; |
1699 | 1699 | ||
@@ -1702,9 +1702,9 @@ static int __irq_domain_activate_irq(struct irq_data *irqd, bool early) | |||
1702 | 1702 | ||
1703 | if (irqd->parent_data) | 1703 | if (irqd->parent_data) |
1704 | ret = __irq_domain_activate_irq(irqd->parent_data, | 1704 | ret = __irq_domain_activate_irq(irqd->parent_data, |
1705 | early); | 1705 | reserve); |
1706 | if (!ret && domain->ops->activate) { | 1706 | if (!ret && domain->ops->activate) { |
1707 | ret = domain->ops->activate(domain, irqd, early); | 1707 | ret = domain->ops->activate(domain, irqd, reserve); |
1708 | /* Rollback in case of error */ | 1708 | /* Rollback in case of error */ |
1709 | if (ret && irqd->parent_data) | 1709 | if (ret && irqd->parent_data) |
1710 | __irq_domain_deactivate_irq(irqd->parent_data); | 1710 | __irq_domain_deactivate_irq(irqd->parent_data); |
@@ -1716,17 +1716,18 @@ static int __irq_domain_activate_irq(struct irq_data *irqd, bool early) | |||
1716 | /** | 1716 | /** |
1717 | * irq_domain_activate_irq - Call domain_ops->activate recursively to activate | 1717 | * irq_domain_activate_irq - Call domain_ops->activate recursively to activate |
1718 | * interrupt | 1718 | * interrupt |
1719 | * @irq_data: outermost irq_data associated with interrupt | 1719 | * @irq_data: Outermost irq_data associated with interrupt |
1720 | * @reserve: If set only reserve an interrupt vector instead of assigning one | ||
1720 | * | 1721 | * |
1721 | * This is the second step to call domain_ops->activate to program interrupt | 1722 | * This is the second step to call domain_ops->activate to program interrupt |
1722 | * controllers, so the interrupt could actually get delivered. | 1723 | * controllers, so the interrupt could actually get delivered. |
1723 | */ | 1724 | */ |
1724 | int irq_domain_activate_irq(struct irq_data *irq_data, bool early) | 1725 | int irq_domain_activate_irq(struct irq_data *irq_data, bool reserve) |
1725 | { | 1726 | { |
1726 | int ret = 0; | 1727 | int ret = 0; |
1727 | 1728 | ||
1728 | if (!irqd_is_activated(irq_data)) | 1729 | if (!irqd_is_activated(irq_data)) |
1729 | ret = __irq_domain_activate_irq(irq_data, early); | 1730 | ret = __irq_domain_activate_irq(irq_data, reserve); |
1730 | if (!ret) | 1731 | if (!ret) |
1731 | irqd_set_activated(irq_data); | 1732 | irqd_set_activated(irq_data); |
1732 | return ret; | 1733 | return ret; |