|
@@ -324,7 +324,7 @@ int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev,
|
|
struct msi_domain_ops *ops = info->ops;
|
|
struct msi_domain_ops *ops = info->ops;
|
|
msi_alloc_info_t arg;
|
|
msi_alloc_info_t arg;
|
|
struct msi_desc *desc;
|
|
struct msi_desc *desc;
|
|
- int i, ret, virq = -1;
|
|
|
|
|
|
+ int i, ret, virq;
|
|
|
|
|
|
ret = msi_domain_prepare_irqs(domain, dev, nvec, &arg);
|
|
ret = msi_domain_prepare_irqs(domain, dev, nvec, &arg);
|
|
if (ret)
|
|
if (ret)
|
|
@@ -332,12 +332,8 @@ int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev,
|
|
|
|
|
|
for_each_msi_entry(desc, dev) {
|
|
for_each_msi_entry(desc, dev) {
|
|
ops->set_desc(&arg, desc);
|
|
ops->set_desc(&arg, desc);
|
|
- if (info->flags & MSI_FLAG_IDENTITY_MAP)
|
|
|
|
- virq = (int)ops->get_hwirq(info, &arg);
|
|
|
|
- else
|
|
|
|
- virq = -1;
|
|
|
|
|
|
|
|
- virq = __irq_domain_alloc_irqs(domain, virq, desc->nvec_used,
|
|
|
|
|
|
+ virq = __irq_domain_alloc_irqs(domain, -1, desc->nvec_used,
|
|
dev_to_node(dev), &arg, false);
|
|
dev_to_node(dev), &arg, false);
|
|
if (virq < 0) {
|
|
if (virq < 0) {
|
|
ret = -ENOSPC;
|
|
ret = -ENOSPC;
|