diff options
Diffstat (limited to 'arch/powerpc/sysdev/fsl_msi.c')
-rw-r--r-- | arch/powerpc/sysdev/fsl_msi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c index 3482e3fd89c0..569dae8ea1ce 100644 --- a/arch/powerpc/sysdev/fsl_msi.c +++ b/arch/powerpc/sysdev/fsl_msi.c | |||
@@ -249,7 +249,7 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev, | |||
249 | goto error_out; | 249 | goto error_out; |
250 | } | 250 | } |
251 | 251 | ||
252 | msi->irqhost = irq_alloc_host(dev->node, IRQ_HOST_MAP_LINEAR, | 252 | msi->irqhost = irq_alloc_host(dev->dev.of_node, IRQ_HOST_MAP_LINEAR, |
253 | NR_MSI_IRQS, &fsl_msi_host_ops, 0); | 253 | NR_MSI_IRQS, &fsl_msi_host_ops, 0); |
254 | 254 | ||
255 | if (msi->irqhost == NULL) { | 255 | if (msi->irqhost == NULL) { |
@@ -259,10 +259,10 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev, | |||
259 | } | 259 | } |
260 | 260 | ||
261 | /* Get the MSI reg base */ | 261 | /* Get the MSI reg base */ |
262 | err = of_address_to_resource(dev->node, 0, &res); | 262 | err = of_address_to_resource(dev->dev.of_node, 0, &res); |
263 | if (err) { | 263 | if (err) { |
264 | dev_err(&dev->dev, "%s resource error!\n", | 264 | dev_err(&dev->dev, "%s resource error!\n", |
265 | dev->node->full_name); | 265 | dev->dev.of_node->full_name); |
266 | goto error_out; | 266 | goto error_out; |
267 | } | 267 | } |
268 | 268 | ||
@@ -285,16 +285,16 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev, | |||
285 | goto error_out; | 285 | goto error_out; |
286 | } | 286 | } |
287 | 287 | ||
288 | p = of_get_property(dev->node, "interrupts", &count); | 288 | p = of_get_property(dev->dev.of_node, "interrupts", &count); |
289 | if (!p) { | 289 | if (!p) { |
290 | dev_err(&dev->dev, "no interrupts property found on %s\n", | 290 | dev_err(&dev->dev, "no interrupts property found on %s\n", |
291 | dev->node->full_name); | 291 | dev->dev.of_node->full_name); |
292 | err = -ENODEV; | 292 | err = -ENODEV; |
293 | goto error_out; | 293 | goto error_out; |
294 | } | 294 | } |
295 | if (count % 8 != 0) { | 295 | if (count % 8 != 0) { |
296 | dev_err(&dev->dev, "Malformed interrupts property on %s\n", | 296 | dev_err(&dev->dev, "Malformed interrupts property on %s\n", |
297 | dev->node->full_name); | 297 | dev->dev.of_node->full_name); |
298 | err = -EINVAL; | 298 | err = -EINVAL; |
299 | goto error_out; | 299 | goto error_out; |
300 | } | 300 | } |
@@ -303,7 +303,7 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev, | |||
303 | for (i = 0; i < count / 2; i++) { | 303 | for (i = 0; i < count / 2; i++) { |
304 | if (i > NR_MSI_REG) | 304 | if (i > NR_MSI_REG) |
305 | break; | 305 | break; |
306 | virt_msir = irq_of_parse_and_map(dev->node, i); | 306 | virt_msir = irq_of_parse_and_map(dev->dev.of_node, i); |
307 | if (virt_msir != NO_IRQ) { | 307 | if (virt_msir != NO_IRQ) { |
308 | set_irq_data(virt_msir, (void *)i); | 308 | set_irq_data(virt_msir, (void *)i); |
309 | set_irq_chained_handler(virt_msir, fsl_msi_cascade); | 309 | set_irq_chained_handler(virt_msir, fsl_msi_cascade); |