korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 08:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

powerpc: fsl_msi doesn't need it's own of_node

Browse Source 
The FSL MSI code keeps a pointer to the of_node from the device
it represents.  However it also has an irq_host, which contains
a pointer to the of_node, so use that one instead.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Michael Ellerman 2008-08-06 09:10:00 +10:00 committed by Paul Mackerras
parent dcfcfe7567
commit 611cd90c91
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/powerpc/sysdev/fsl_msi.c
View File

@ -108,7 +108,8 @@ static int fsl_msi_free_dt_hwirqs(struct fsl_msi *msi)
bitmap_allocate_region(msi->fsl_msi_bitmap, 0,
get_count_order(NR_MSI_IRQS));
p = of_get_property(msi->of_node, "msi-available-ranges", &len);
p = of_get_property(msi->irqhost->of_node, "msi-available-ranges",
&len);
if (!p) {
/* No msi-available-ranges property,
@ -120,7 +121,7 @@ static int fsl_msi_free_dt_hwirqs(struct fsl_msi *msi)
if ((len % (2 * sizeof(u32))) != 0) {
printk(KERN_WARNING "fsl_msi: Malformed msi-available-ranges "
"property on %s\n", msi->of_node->full_name);
"property on %s\n", msi->irqhost->of_node->full_name);
return -EINVAL;
}
@ -317,14 +318,11 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
goto error_out;
}
msi->of_node = of_node_get(dev->node);
msi->irqhost = irq_alloc_host(dev->node, IRQ_HOST_MAP_LINEAR,
NR_MSI_IRQS, &fsl_msi_host_ops, 0);
msi->irqhost = irq_alloc_host(of_node_get(dev->node),
IRQ_HOST_MAP_LINEAR,
NR_MSI_IRQS, &fsl_msi_host_ops, 0);
if (msi->irqhost == NULL) {
dev_err(&dev->dev, "No memory for MSI irqhost\n");
of_node_put(dev->node);
err = -ENOMEM;
goto error_out;
}

3
arch/powerpc/sysdev/fsl_msi.h
View File

@ -22,9 +22,6 @@
#define FSL_PIC_IP_IPIC 0x00000002
struct fsl_msi {
/* Device node of the MSI interrupt*/
struct device_node *of_node;
struct irq_host *irqhost;
unsigned long cascade_irq;