projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zram: fix unbalanced idr management at hot removal
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
irqchip
/
irq-gic-v3-its-pci-msi.c
diff --git
a/drivers/irqchip/irq-gic-v3-its-pci-msi.c
b/drivers/irqchip/irq-gic-v3-its-pci-msi.c
index a7c8c9ffbafd3503228a6c4e63c6870b5d9c784c..aee60ed025dccfab0c6f6b81dbe4e1678a91279c 100644
(file)
--- a/
drivers/irqchip/irq-gic-v3-its-pci-msi.c
+++ b/
drivers/irqchip/irq-gic-v3-its-pci-msi.c
@@
-42,7
+42,6
@@
static struct irq_chip its_msi_irq_chip = {
struct its_pci_alias {
struct pci_dev *pdev;
struct its_pci_alias {
struct pci_dev *pdev;
- u32 dev_id;
u32 count;
};
u32 count;
};
@@
-60,7
+59,6
@@
static int its_get_pci_alias(struct pci_dev *pdev, u16 alias, void *data)
{
struct its_pci_alias *dev_alias = data;
{
struct its_pci_alias *dev_alias = data;
- dev_alias->dev_id = alias;
if (pdev != dev_alias->pdev)
dev_alias->count += its_pci_msi_vec_count(pdev);
if (pdev != dev_alias->pdev)
dev_alias->count += its_pci_msi_vec_count(pdev);
@@
-86,7
+84,7
@@
static int its_pci_msi_prepare(struct irq_domain *domain, struct device *dev,
pci_for_each_dma_alias(pdev, its_get_pci_alias, &dev_alias);
/* ITS specific DeviceID, as the core ITS ignores dev. */
pci_for_each_dma_alias(pdev, its_get_pci_alias, &dev_alias);
/* ITS specific DeviceID, as the core ITS ignores dev. */
- info->scratchpad[0].ul =
dev_alias.dev_id
;
+ info->scratchpad[0].ul =
pci_msi_domain_get_msi_rid(domain, pdev)
;
return msi_info->ops->msi_prepare(domain->parent,
dev, dev_alias.count, info);
return msi_info->ops->msi_prepare(domain->parent,
dev, dev_alias.count, info);
@@
-125,7
+123,8
@@
static int __init its_pci_msi_init(void)
continue;
}
continue;
}
- if (!pci_msi_create_irq_domain(np, &its_pci_msi_domain_info,
+ if (!pci_msi_create_irq_domain(of_node_to_fwnode(np),
+ &its_pci_msi_domain_info,
parent)) {
pr_err("%s: unable to create PCI domain\n",
np->full_name);
parent)) {
pr_err("%s: unable to create PCI domain\n",
np->full_name);