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
parent
a10024e671
commit
38c1e73fde
|
|
@ -222,8 +222,7 @@ static inline struct device_node *irq_domain_get_of_node(struct irq_domain *d)
|
|||
return to_of_node(d->fwnode);
|
||||
}
|
||||
|
||||
static inline void irq_domain_set_pm_device(struct irq_domain *d,
|
||||
struct device *dev)
|
||||
static inline void irq_domain_set_pm_device(struct irq_domain *d, struct device *dev)
|
||||
{
|
||||
if (d)
|
||||
d->pm_dev = dev;
|
||||
|
|
@ -239,14 +238,12 @@ enum {
|
|||
IRQCHIP_FWNODE_NAMED_ID,
|
||||
};
|
||||
|
||||
static inline
|
||||
struct fwnode_handle *irq_domain_alloc_named_fwnode(const char *name)
|
||||
static inline struct fwnode_handle *irq_domain_alloc_named_fwnode(const char *name)
|
||||
{
|
||||
return __irq_domain_alloc_fwnode(IRQCHIP_FWNODE_NAMED, 0, name, NULL);
|
||||
}
|
||||
|
||||
static inline
|
||||
struct fwnode_handle *irq_domain_alloc_named_id_fwnode(const char *name, int id)
|
||||
static inline 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,
|
||||
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,
|
||||
const struct irq_domain_info *info);
|
||||
|
||||
struct irq_domain *irq_domain_create_simple(struct fwnode_handle *fwnode,
|
||||
unsigned int size,
|
||||
struct irq_domain *irq_domain_create_simple(struct fwnode_handle *fwnode, unsigned int size,
|
||||
unsigned int first_irq,
|
||||
const struct irq_domain_ops *ops,
|
||||
void *host_data);
|
||||
struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode,
|
||||
unsigned int size,
|
||||
unsigned int first_irq,
|
||||
irq_hw_number_t first_hwirq,
|
||||
const struct irq_domain_ops *ops,
|
||||
void *host_data);
|
||||
const struct irq_domain_ops *ops, void *host_data);
|
||||
struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode, unsigned int size,
|
||||
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,
|
||||
enum irq_domain_bus_token bus_token);
|
||||
void irq_set_default_domain(struct irq_domain *domain);
|
||||
struct irq_domain *irq_get_default_domain(void);
|
||||
int irq_domain_alloc_descs(int virq, unsigned int nr_irqs,
|
||||
irq_hw_number_t hwirq, int node,
|
||||
int irq_domain_alloc_descs(int virq, unsigned int nr_irqs, irq_hw_number_t hwirq, int node,
|
||||
const struct irq_affinity_desc *affinity);
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
void irq_domain_update_bus_token(struct irq_domain *domain,
|
||||
enum irq_domain_bus_token bus_token);
|
||||
void irq_domain_update_bus_token(struct irq_domain *domain, enum irq_domain_bus_token bus_token);
|
||||
|
||||
static inline
|
||||
struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,
|
||||
static inline struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,
|
||||
enum irq_domain_bus_token bus_token)
|
||||
{
|
||||
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);
|
||||
|
||||
int irq_domain_associate(struct irq_domain *domain, unsigned int irq,
|
||||
irq_hw_number_t hwirq);
|
||||
void irq_domain_associate_many(struct irq_domain *domain,
|
||||
unsigned int irq_base,
|
||||
int irq_domain_associate(struct irq_domain *domain, unsigned int irq, irq_hw_number_t hwirq);
|
||||
void irq_domain_associate_many(struct irq_domain *domain, unsigned int irq_base,
|
||||
irq_hw_number_t hwirq_base, int count);
|
||||
|
||||
unsigned int irq_create_mapping_affinity(struct irq_domain *domain,
|
||||
irq_hw_number_t hwirq,
|
||||
unsigned int irq_create_mapping_affinity(struct irq_domain *domain, irq_hw_number_t hwirq,
|
||||
const struct irq_affinity_desc *affinity);
|
||||
unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec);
|
||||
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
|
||||
*/
|
||||
static inline unsigned int irq_create_mapping(struct irq_domain *domain,
|
||||
irq_hw_number_t hwirq)
|
||||
static inline unsigned int irq_create_mapping(struct irq_domain *domain, irq_hw_number_t hwirq)
|
||||
{
|
||||
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);
|
||||
|
||||
/* V2 interfaces to support hierarchy IRQ domains. */
|
||||
struct irq_data *irq_domain_get_irq_data(struct irq_domain *domain,
|
||||
unsigned int virq);
|
||||
void irq_domain_set_info(struct irq_domain *domain, unsigned int virq,
|
||||
irq_hw_number_t hwirq,
|
||||
const struct irq_chip *chip,
|
||||
void *chip_data, irq_flow_handler_t handler,
|
||||
struct irq_data *irq_domain_get_irq_data(struct irq_domain *domain, unsigned int virq);
|
||||
void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, 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 irq_domain_reset_irq_data(struct irq_data *irq_data);
|
||||
#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.
|
||||
*/
|
||||
static inline struct irq_domain *irq_domain_create_hierarchy(struct irq_domain *parent,
|
||||
unsigned int flags,
|
||||
unsigned int size,
|
||||
unsigned int flags, unsigned int size,
|
||||
struct fwnode_handle *fwnode,
|
||||
const struct irq_domain_ops *ops,
|
||||
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;
|
||||
}
|
||||
|
||||
int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base,
|
||||
unsigned int nr_irqs, int node, void *arg,
|
||||
bool realloc,
|
||||
int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base, unsigned int nr_irqs,
|
||||
int node, void *arg, bool realloc,
|
||||
const struct irq_affinity_desc *affinity);
|
||||
void irq_domain_free_irqs(unsigned int virq, unsigned int nr_irqs);
|
||||
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.
|
||||
*/
|
||||
static inline int irq_domain_alloc_irqs(struct irq_domain *domain,
|
||||
unsigned int nr_irqs, int node, void *arg)
|
||||
static inline int irq_domain_alloc_irqs(struct irq_domain *domain, unsigned int nr_irqs,
|
||||
int node, void *arg)
|
||||
{
|
||||
return __irq_domain_alloc_irqs(domain, -1, nr_irqs, node, arg, false,
|
||||
NULL);
|
||||
return __irq_domain_alloc_irqs(domain, -1, nr_irqs, node, arg, false, NULL);
|
||||
}
|
||||
|
||||
int irq_domain_set_hwirq_and_chip(struct irq_domain *domain,
|
||||
unsigned int virq,
|
||||
irq_hw_number_t hwirq,
|
||||
const struct irq_chip *chip,
|
||||
int irq_domain_set_hwirq_and_chip(struct irq_domain *domain, unsigned int virq,
|
||||
irq_hw_number_t hwirq, const struct irq_chip *chip,
|
||||
void *chip_data);
|
||||
void irq_domain_free_irqs_common(struct irq_domain *domain,
|
||||
unsigned int virq,
|
||||
void irq_domain_free_irqs_common(struct irq_domain *domain, unsigned int virq,
|
||||
unsigned int nr_irqs);
|
||||
void irq_domain_free_irqs_top(struct irq_domain *domain,
|
||||
unsigned int virq, unsigned int nr_irqs);
|
||||
void irq_domain_free_irqs_top(struct irq_domain *domain, unsigned int virq, unsigned int nr_irqs);
|
||||
|
||||
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_alloc_irqs_parent(struct irq_domain *domain,
|
||||
unsigned int irq_base,
|
||||
int irq_domain_alloc_irqs_parent(struct irq_domain *domain, unsigned int irq_base,
|
||||
unsigned int nr_irqs, void *arg);
|
||||
|
||||
void irq_domain_free_irqs_parent(struct irq_domain *domain,
|
||||
unsigned int irq_base,
|
||||
void irq_domain_free_irqs_parent(struct irq_domain *domain, unsigned int irq_base,
|
||||
unsigned int nr_irqs);
|
||||
|
||||
int irq_domain_disconnect_hierarchy(struct irq_domain *domain,
|
||||
unsigned int virq);
|
||||
int irq_domain_disconnect_hierarchy(struct irq_domain *domain, unsigned int virq);
|
||||
|
||||
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)
|
||||
{
|
||||
return domain->flags &
|
||||
(IRQ_DOMAIN_FLAG_IPI_PER_CPU | IRQ_DOMAIN_FLAG_IPI_SINGLE);
|
||||
return domain->flags & (IRQ_DOMAIN_FLAG_IPI_PER_CPU | IRQ_DOMAIN_FLAG_IPI_SINGLE);
|
||||
}
|
||||
|
||||
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 */
|
||||
static inline int irq_domain_alloc_irqs(struct irq_domain *domain,
|
||||
unsigned int nr_irqs, int node, void *arg)
|
||||
static inline int irq_domain_alloc_irqs(struct irq_domain *domain, unsigned int nr_irqs,
|
||||
int node, void *arg)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
static inline void irq_domain_free_irqs(unsigned int virq,
|
||||
unsigned int nr_irqs) { }
|
||||
static inline void irq_domain_free_irqs(unsigned int virq, unsigned int nr_irqs) { }
|
||||
|
||||
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 */
|
||||
|
||||
#ifdef CONFIG_GENERIC_MSI_IRQ
|
||||
int msi_device_domain_alloc_wired(struct irq_domain *domain, unsigned int hwirq,
|
||||
unsigned int type);
|
||||
int msi_device_domain_alloc_wired(struct irq_domain *domain, unsigned int hwirq, unsigned int type);
|
||||
void msi_device_domain_free_wired(struct irq_domain *domain, unsigned int virq);
|
||||
#else
|
||||
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 */
|
||||
static inline void irq_dispose_mapping(unsigned int virq) { }
|
||||
static inline struct irq_domain *irq_find_matching_fwnode(
|
||||
struct fwnode_handle *fwnode, enum irq_domain_bus_token bus_token)
|
||||
static inline struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,
|
||||
enum irq_domain_bus_token bus_token)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue