diff options
Diffstat (limited to 'drivers/char/ipmi/ipmi_si_intf.c')
-rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 4462b113ba3f..47ffe4a90a95 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -2469,7 +2469,7 @@ static int __devinit ipmi_of_probe(struct of_device *dev, | |||
2469 | struct smi_info *info; | 2469 | struct smi_info *info; |
2470 | struct resource resource; | 2470 | struct resource resource; |
2471 | const int *regsize, *regspacing, *regshift; | 2471 | const int *regsize, *regspacing, *regshift; |
2472 | struct device_node *np = dev->node; | 2472 | struct device_node *np = dev->dev.of_node; |
2473 | int ret; | 2473 | int ret; |
2474 | int proplen; | 2474 | int proplen; |
2475 | 2475 | ||
@@ -2525,7 +2525,7 @@ static int __devinit ipmi_of_probe(struct of_device *dev, | |||
2525 | info->io.regspacing = regspacing ? *regspacing : DEFAULT_REGSPACING; | 2525 | info->io.regspacing = regspacing ? *regspacing : DEFAULT_REGSPACING; |
2526 | info->io.regshift = regshift ? *regshift : 0; | 2526 | info->io.regshift = regshift ? *regshift : 0; |
2527 | 2527 | ||
2528 | info->irq = irq_of_parse_and_map(dev->node, 0); | 2528 | info->irq = irq_of_parse_and_map(dev->dev.of_node, 0); |
2529 | info->dev = &dev->dev; | 2529 | info->dev = &dev->dev; |
2530 | 2530 | ||
2531 | dev_dbg(&dev->dev, "addr 0x%lx regsize %d spacing %d irq %x\n", | 2531 | dev_dbg(&dev->dev, "addr 0x%lx regsize %d spacing %d irq %x\n", |
@@ -2555,8 +2555,11 @@ static struct of_device_id ipmi_match[] = | |||
2555 | }; | 2555 | }; |
2556 | 2556 | ||
2557 | static struct of_platform_driver ipmi_of_platform_driver = { | 2557 | static struct of_platform_driver ipmi_of_platform_driver = { |
2558 | .name = "ipmi", | 2558 | .driver = { |
2559 | .match_table = ipmi_match, | 2559 | .name = "ipmi", |
2560 | .owner = THIS_MODULE, | ||
2561 | .of_match_table = ipmi_match, | ||
2562 | }, | ||
2560 | .probe = ipmi_of_probe, | 2563 | .probe = ipmi_of_probe, |
2561 | .remove = __devexit_p(ipmi_of_remove), | 2564 | .remove = __devexit_p(ipmi_of_remove), |
2562 | }; | 2565 | }; |