genirq/irqdomain: Rename irq_domain::dev to irq_domain:: Pm_dev

irq_domain::dev is a misnomer as it's usually the rule that a device
pointer points to something which is directly related to the instance.

irq_domain::dev can point to some other device for power management to
ensure that this underlying device is not powered down when an interrupt is
allocated.

The upcoming per device MSI domains really require a pointer to the device
which instantiated the irq domain and not to some random other device which
is required for power management down the chain.

Rename irq_domain::dev to irq_domain::pm_dev and fixup the few sites which
use that pointer.

Conversion was done with the help of coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Acked-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20221124230313.574541683@linutronix.de

diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 4c7bae0ec8f96e000aa1e46490bb3165f388f11b..08834e5ac19c432c9b5e60e039eef6320b4660a5 100644 (file)
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -401,8 +401,8 @@ static void gic_irq_print_chip(struct irq_data *d, struct seq_file *p)
 {
        struct gic_chip_data *gic = irq_data_get_irq_chip_data(d);
 
-       if (gic->domain->dev)
-               seq_printf(p, gic->domain->dev->of_node->name);
+       if (gic->domain->pm_dev)
+               seq_printf(p, gic->domain->pm_dev->of_node->name);
        else
                seq_printf(p, "GIC-%d", (int)(gic - &gic_data[0]));
 }

diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index b1fdd8d309cfa5a08f91f35bc986015e6d4fe6b6..aa76da82fa3680240d313bce9666f071a912dbaf 100644 (file)
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -131,7 +131,7 @@ struct irq_domain_chip_generic;
  * @gc:                Pointer to a list of generic chips. There is a helper function for
  *             setting up one or more generic chips for interrupt controllers
  *             drivers using the generic chip library which uses this pointer.
- * @dev:       Pointer to a device that can be utilized for power management
+ * @pm_dev:    Pointer to a device that can be utilized for power management
  *             purposes related to the irq domain.
  * @parent:    Pointer to parent irq_domain to support hierarchy irq_domains
  *
@@ -153,7 +153,7 @@ struct irq_domain {
        struct fwnode_handle            *fwnode;
        enum irq_domain_bus_token       bus_token;
        struct irq_domain_chip_generic  *gc;
-       struct device                   *dev;
+       struct device                   *pm_dev;
 #ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
        struct irq_domain               *parent;
 #endif
@@ -206,7 +206,7 @@ static inline void irq_domain_set_pm_device(struct irq_domain *d,
                                            struct device *dev)
 {
        if (d)
-               d->dev = dev;
+               d->pm_dev = dev;
 }
 
 #ifdef CONFIG_IRQ_DOMAIN

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 8ac37e8e738a3b48f685fab8079bbd49ed06c279..49e7bc871fece411db9833313b414b90f3a26b72 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -1561,10 +1561,10 @@ int irq_chip_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
        return 0;
 }
 
-static struct device *irq_get_parent_device(struct irq_data *data)
+static struct device *irq_get_pm_device(struct irq_data *data)
 {
        if (data->domain)
-               return data->domain->dev;
+               return data->domain->pm_dev;
 
        return NULL;
 }
@@ -1578,7 +1578,7 @@ static struct device *irq_get_parent_device(struct irq_data *data)
  */
 int irq_chip_pm_get(struct irq_data *data)
 {
-       struct device *dev = irq_get_parent_device(data);
+       struct device *dev = irq_get_pm_device(data);
        int retval = 0;
 
        if (IS_ENABLED(CONFIG_PM) && dev)
@@ -1597,7 +1597,7 @@ int irq_chip_pm_get(struct irq_data *data)
  */
 int irq_chip_pm_put(struct irq_data *data)
 {
-       struct device *dev = irq_get_parent_device(data);
+       struct device *dev = irq_get_pm_device(data);
        int retval = 0;
 
        if (IS_ENABLED(CONFIG_PM) && dev)