On 09/16/2013 03:32 AM, Thierry Reding wrote: > This is a version of irq_create_of_mapping() that propagates the precise > error code instead of returning 0 for all errors. It will be used in > subsequent patches to allow further propagation of error codes. > > To avoid code duplication, implement irq_create_of_mapping() as a > wrapper around the new __irq_create_of_mapping().
This function is a manageable number of callers that the callers should just be updated and avoid the wrapper. Rob > > Signed-off-by: Thierry Reding <[email protected]> > --- > include/linux/of_irq.h | 3 +++ > kernel/irq/irqdomain.c | 39 +++++++++++++++++++++++++++++---------- > 2 files changed, 32 insertions(+), 10 deletions(-) > > diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h > index 535cecf..c383dd1 100644 > --- a/include/linux/of_irq.h > +++ b/include/linux/of_irq.h > @@ -63,6 +63,9 @@ extern int of_irq_map_raw(struct device_node *parent, const > __be32 *intspec, > struct of_irq *out_irq); > extern int of_irq_map_one(struct device_node *device, int index, > struct of_irq *out_irq); > +extern int __irq_create_of_mapping(struct device_node *controller, > + const u32 *intspec, unsigned int intsize, > + unsigned int *virqp); > extern unsigned int irq_create_of_mapping(struct device_node *controller, > const u32 *intspec, > unsigned int intsize); > diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c > index d2a3b01..9867616 100644 > --- a/kernel/irq/irqdomain.c > +++ b/kernel/irq/irqdomain.c > @@ -484,39 +484,58 @@ int irq_create_strict_mappings(struct irq_domain > *domain, unsigned int irq_base, > } > EXPORT_SYMBOL_GPL(irq_create_strict_mappings); > > -unsigned int irq_create_of_mapping(struct device_node *controller, > - const u32 *intspec, unsigned int intsize) > +int __irq_create_of_mapping(struct device_node *controller, const u32 > *intspec, > + unsigned int intsize, unsigned int *virqp) > { > + unsigned int type = IRQ_TYPE_NONE; > struct irq_domain *domain; > irq_hw_number_t hwirq; > - unsigned int type = IRQ_TYPE_NONE; > unsigned int virq; > + int ret; > > domain = controller ? irq_find_host(controller) : irq_default_domain; > if (!domain) { > pr_warn("no irq domain found for %s !\n", > of_node_full_name(controller)); > - return 0; > + return -EPROBE_DEFER; > } > > /* If domain has no translation, then we assume interrupt line */ > if (domain->ops->xlate == NULL) > hwirq = intspec[0]; > else { > - if (domain->ops->xlate(domain, controller, intspec, intsize, > - &hwirq, &type)) > - return 0; > + ret = domain->ops->xlate(domain, controller, intspec, intsize, > + &hwirq, &type); > + if (ret) > + return ret; > } > > /* Create mapping */ > - virq = irq_create_mapping(domain, hwirq); > - if (!virq) > - return virq; > + ret = __irq_create_mapping(domain, hwirq, &virq); > + if (ret) > + return ret; > > /* Set type if specified and different than the current one */ > if (type != IRQ_TYPE_NONE && > type != irq_get_trigger_type(virq)) > irq_set_irq_type(virq, type); > + > + if (virqp) > + *virqp = virq; > + > + return 0; > +} > + > +unsigned int irq_create_of_mapping(struct device_node *controller, > + const u32 *intspec, unsigned int intsize) > +{ > + unsigned int virq; > + int ret; > + > + ret = __irq_create_of_mapping(controller, intspec, intsize, &virq); > + if (ret) > + return 0; > + > return virq; > } > EXPORT_SYMBOL_GPL(irq_create_of_mapping); > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
