irqdomain: Consolidate coding style

Now that the file has been thrown through the mincer, finish the job and
consolidate the coding style.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
pull/1250/head
Thomas Gleixner 2025-05-06 14:22:59 +02:00
parent a10024e671
commit 38c1e73fde
1 changed files with 113 additions and 144 deletions

View File

@ -222,8 +222,7 @@ static inline struct device_node *irq_domain_get_of_node(struct irq_domain *d)
return to_of_node(d->fwnode); return to_of_node(d->fwnode);
} }
static inline void irq_domain_set_pm_device(struct irq_domain *d, static inline void irq_domain_set_pm_device(struct irq_domain *d, struct device *dev)
struct device *dev)
{ {
if (d) if (d)
d->pm_dev = dev; d->pm_dev = dev;
@ -239,14 +238,12 @@ enum {
IRQCHIP_FWNODE_NAMED_ID, IRQCHIP_FWNODE_NAMED_ID,
}; };
static inline static inline struct fwnode_handle *irq_domain_alloc_named_fwnode(const char *name)
struct fwnode_handle *irq_domain_alloc_named_fwnode(const char *name)
{ {
return __irq_domain_alloc_fwnode(IRQCHIP_FWNODE_NAMED, 0, name, NULL); return __irq_domain_alloc_fwnode(IRQCHIP_FWNODE_NAMED, 0, name, NULL);
} }
static inline static inline struct fwnode_handle *irq_domain_alloc_named_id_fwnode(const char *name, int id)
struct fwnode_handle *irq_domain_alloc_named_id_fwnode(const char *name, int id)
{ {
return __irq_domain_alloc_fwnode(IRQCHIP_FWNODE_NAMED_ID, id, name, return __irq_domain_alloc_fwnode(IRQCHIP_FWNODE_NAMED_ID, id, name,
NULL); NULL);
@ -311,23 +308,17 @@ struct irq_domain *irq_domain_instantiate(const struct irq_domain_info *info);
struct irq_domain *devm_irq_domain_instantiate(struct device *dev, struct irq_domain *devm_irq_domain_instantiate(struct device *dev,
const struct irq_domain_info *info); const struct irq_domain_info *info);
struct irq_domain *irq_domain_create_simple(struct fwnode_handle *fwnode, struct irq_domain *irq_domain_create_simple(struct fwnode_handle *fwnode, unsigned int size,
unsigned int size,
unsigned int first_irq, unsigned int first_irq,
const struct irq_domain_ops *ops, const struct irq_domain_ops *ops, void *host_data);
void *host_data); struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode, unsigned int size,
struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode, unsigned int first_irq, irq_hw_number_t first_hwirq,
unsigned int size, const struct irq_domain_ops *ops, void *host_data);
unsigned int first_irq,
irq_hw_number_t first_hwirq,
const struct irq_domain_ops *ops,
void *host_data);
struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec, struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec,
enum irq_domain_bus_token bus_token); enum irq_domain_bus_token bus_token);
void irq_set_default_domain(struct irq_domain *domain); void irq_set_default_domain(struct irq_domain *domain);
struct irq_domain *irq_get_default_domain(void); struct irq_domain *irq_get_default_domain(void);
int irq_domain_alloc_descs(int virq, unsigned int nr_irqs, int irq_domain_alloc_descs(int virq, unsigned int nr_irqs, irq_hw_number_t hwirq, int node,
irq_hw_number_t hwirq, int node,
const struct irq_affinity_desc *affinity); const struct irq_affinity_desc *affinity);
extern const struct fwnode_operations irqchip_fwnode_ops; extern const struct fwnode_operations irqchip_fwnode_ops;
@ -337,11 +328,9 @@ static inline bool is_fwnode_irqchip(const struct fwnode_handle *fwnode)
return fwnode && fwnode->ops == &irqchip_fwnode_ops; return fwnode && fwnode->ops == &irqchip_fwnode_ops;
} }
void irq_domain_update_bus_token(struct irq_domain *domain, void irq_domain_update_bus_token(struct irq_domain *domain, enum irq_domain_bus_token bus_token);
enum irq_domain_bus_token bus_token);
static inline static inline struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,
struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,
enum irq_domain_bus_token bus_token) enum irq_domain_bus_token bus_token)
{ {
struct irq_fwspec fwspec = { struct irq_fwspec fwspec = {
@ -432,14 +421,11 @@ static inline struct irq_domain *irq_domain_create_tree(struct fwnode_handle *fw
void irq_domain_remove(struct irq_domain *domain); void irq_domain_remove(struct irq_domain *domain);
int irq_domain_associate(struct irq_domain *domain, unsigned int irq, int irq_domain_associate(struct irq_domain *domain, unsigned int irq, irq_hw_number_t hwirq);
irq_hw_number_t hwirq); void irq_domain_associate_many(struct irq_domain *domain, unsigned int irq_base,
void irq_domain_associate_many(struct irq_domain *domain,
unsigned int irq_base,
irq_hw_number_t hwirq_base, int count); irq_hw_number_t hwirq_base, int count);
unsigned int irq_create_mapping_affinity(struct irq_domain *domain, unsigned int irq_create_mapping_affinity(struct irq_domain *domain, irq_hw_number_t hwirq,
irq_hw_number_t hwirq,
const struct irq_affinity_desc *affinity); const struct irq_affinity_desc *affinity);
unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec); unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec);
void irq_dispose_mapping(unsigned int virq); void irq_dispose_mapping(unsigned int virq);
@ -456,8 +442,7 @@ void irq_dispose_mapping(unsigned int virq);
* *
* Returns: Linux irq number or 0 on error * Returns: Linux irq number or 0 on error
*/ */
static inline unsigned int irq_create_mapping(struct irq_domain *domain, static inline unsigned int irq_create_mapping(struct irq_domain *domain, irq_hw_number_t hwirq)
irq_hw_number_t hwirq)
{ {
return irq_create_mapping_affinity(domain, hwirq, NULL); return irq_create_mapping_affinity(domain, hwirq, NULL);
} }
@ -525,12 +510,9 @@ int irq_reserve_ipi(struct irq_domain *domain, const struct cpumask *dest);
int irq_destroy_ipi(unsigned int irq, const struct cpumask *dest); int irq_destroy_ipi(unsigned int irq, const struct cpumask *dest);
/* V2 interfaces to support hierarchy IRQ domains. */ /* V2 interfaces to support hierarchy IRQ domains. */
struct irq_data *irq_domain_get_irq_data(struct irq_domain *domain, struct irq_data *irq_domain_get_irq_data(struct irq_domain *domain, unsigned int virq);
unsigned int virq); void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, irq_hw_number_t hwirq,
void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, const struct irq_chip *chip, void *chip_data, irq_flow_handler_t handler,
irq_hw_number_t hwirq,
const struct irq_chip *chip,
void *chip_data, irq_flow_handler_t handler,
void *handler_data, const char *handler_name); void *handler_data, const char *handler_name);
void irq_domain_reset_irq_data(struct irq_data *irq_data); void irq_domain_reset_irq_data(struct irq_data *irq_data);
#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY #ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
@ -551,8 +533,7 @@ void irq_domain_reset_irq_data(struct irq_data *irq_data);
* Returns: A pointer to IRQ domain, or %NULL on failure. * Returns: A pointer to IRQ domain, or %NULL on failure.
*/ */
static inline struct irq_domain *irq_domain_create_hierarchy(struct irq_domain *parent, static inline struct irq_domain *irq_domain_create_hierarchy(struct irq_domain *parent,
unsigned int flags, unsigned int flags, unsigned int size,
unsigned int size,
struct fwnode_handle *fwnode, struct fwnode_handle *fwnode,
const struct irq_domain_ops *ops, const struct irq_domain_ops *ops,
void *host_data) void *host_data)
@ -571,9 +552,8 @@ static inline struct irq_domain *irq_domain_create_hierarchy(struct irq_domain *
return IS_ERR(d) ? NULL : d; return IS_ERR(d) ? NULL : d;
} }
int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base, int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base, unsigned int nr_irqs,
unsigned int nr_irqs, int node, void *arg, int node, void *arg, bool realloc,
bool realloc,
const struct irq_affinity_desc *affinity); const struct irq_affinity_desc *affinity);
void irq_domain_free_irqs(unsigned int virq, unsigned int nr_irqs); void irq_domain_free_irqs(unsigned int virq, unsigned int nr_irqs);
int irq_domain_activate_irq(struct irq_data *irq_data, bool early); int irq_domain_activate_irq(struct irq_data *irq_data, bool early);
@ -588,37 +568,29 @@ void irq_domain_deactivate_irq(struct irq_data *irq_data);
* *
* See __irq_domain_alloc_irqs()' documentation. * See __irq_domain_alloc_irqs()' documentation.
*/ */
static inline int irq_domain_alloc_irqs(struct irq_domain *domain, static inline int irq_domain_alloc_irqs(struct irq_domain *domain, unsigned int nr_irqs,
unsigned int nr_irqs, int node, void *arg) int node, void *arg)
{ {
return __irq_domain_alloc_irqs(domain, -1, nr_irqs, node, arg, false, return __irq_domain_alloc_irqs(domain, -1, nr_irqs, node, arg, false, NULL);
NULL);
} }
int irq_domain_set_hwirq_and_chip(struct irq_domain *domain, int irq_domain_set_hwirq_and_chip(struct irq_domain *domain, unsigned int virq,
unsigned int virq, irq_hw_number_t hwirq, const struct irq_chip *chip,
irq_hw_number_t hwirq,
const struct irq_chip *chip,
void *chip_data); void *chip_data);
void irq_domain_free_irqs_common(struct irq_domain *domain, void irq_domain_free_irqs_common(struct irq_domain *domain, unsigned int virq,
unsigned int virq,
unsigned int nr_irqs); unsigned int nr_irqs);
void irq_domain_free_irqs_top(struct irq_domain *domain, void irq_domain_free_irqs_top(struct irq_domain *domain, unsigned int virq, unsigned int nr_irqs);
unsigned int virq, unsigned int nr_irqs);
int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg); int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg);
int irq_domain_pop_irq(struct irq_domain *domain, int virq); int irq_domain_pop_irq(struct irq_domain *domain, int virq);
int irq_domain_alloc_irqs_parent(struct irq_domain *domain, int irq_domain_alloc_irqs_parent(struct irq_domain *domain, unsigned int irq_base,
unsigned int irq_base,
unsigned int nr_irqs, void *arg); unsigned int nr_irqs, void *arg);
void irq_domain_free_irqs_parent(struct irq_domain *domain, void irq_domain_free_irqs_parent(struct irq_domain *domain, unsigned int irq_base,
unsigned int irq_base,
unsigned int nr_irqs); unsigned int nr_irqs);
int irq_domain_disconnect_hierarchy(struct irq_domain *domain, int irq_domain_disconnect_hierarchy(struct irq_domain *domain, unsigned int virq);
unsigned int virq);
static inline bool irq_domain_is_hierarchy(struct irq_domain *domain) static inline bool irq_domain_is_hierarchy(struct irq_domain *domain)
{ {
@ -627,8 +599,7 @@ static inline bool irq_domain_is_hierarchy(struct irq_domain *domain)
static inline bool irq_domain_is_ipi(struct irq_domain *domain) static inline bool irq_domain_is_ipi(struct irq_domain *domain)
{ {
return domain->flags & return domain->flags & (IRQ_DOMAIN_FLAG_IPI_PER_CPU | IRQ_DOMAIN_FLAG_IPI_SINGLE);
(IRQ_DOMAIN_FLAG_IPI_PER_CPU | IRQ_DOMAIN_FLAG_IPI_SINGLE);
} }
static inline bool irq_domain_is_ipi_per_cpu(struct irq_domain *domain) static inline bool irq_domain_is_ipi_per_cpu(struct irq_domain *domain)
@ -657,14 +628,13 @@ static inline bool irq_domain_is_msi_device(struct irq_domain *domain)
} }
#else /* CONFIG_IRQ_DOMAIN_HIERARCHY */ #else /* CONFIG_IRQ_DOMAIN_HIERARCHY */
static inline int irq_domain_alloc_irqs(struct irq_domain *domain, static inline int irq_domain_alloc_irqs(struct irq_domain *domain, unsigned int nr_irqs,
unsigned int nr_irqs, int node, void *arg) int node, void *arg)
{ {
return -1; return -1;
} }
static inline void irq_domain_free_irqs(unsigned int virq, static inline void irq_domain_free_irqs(unsigned int virq, unsigned int nr_irqs) { }
unsigned int nr_irqs) { }
static inline bool irq_domain_is_hierarchy(struct irq_domain *domain) static inline bool irq_domain_is_hierarchy(struct irq_domain *domain)
{ {
@ -704,8 +674,7 @@ static inline bool irq_domain_is_msi_device(struct irq_domain *domain)
#endif /* CONFIG_IRQ_DOMAIN_HIERARCHY */ #endif /* CONFIG_IRQ_DOMAIN_HIERARCHY */
#ifdef CONFIG_GENERIC_MSI_IRQ #ifdef CONFIG_GENERIC_MSI_IRQ
int msi_device_domain_alloc_wired(struct irq_domain *domain, unsigned int hwirq, int msi_device_domain_alloc_wired(struct irq_domain *domain, unsigned int hwirq, unsigned int type);
unsigned int type);
void msi_device_domain_free_wired(struct irq_domain *domain, unsigned int virq); void msi_device_domain_free_wired(struct irq_domain *domain, unsigned int virq);
#else #else
static inline int msi_device_domain_alloc_wired(struct irq_domain *domain, unsigned int hwirq, static inline int msi_device_domain_alloc_wired(struct irq_domain *domain, unsigned int hwirq,
@ -762,8 +731,8 @@ static inline struct irq_domain *irq_domain_add_linear(struct device_node *of_no
#else /* CONFIG_IRQ_DOMAIN */ #else /* CONFIG_IRQ_DOMAIN */
static inline void irq_dispose_mapping(unsigned int virq) { } static inline void irq_dispose_mapping(unsigned int virq) { }
static inline struct irq_domain *irq_find_matching_fwnode( static inline struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,
struct fwnode_handle *fwnode, enum irq_domain_bus_token bus_token) enum irq_domain_bus_token bus_token)
{ {
return NULL; return NULL;
} }