diff options
Diffstat (limited to 'arch/sparc/kernel/chmc.c')
-rw-r--r-- | arch/sparc/kernel/chmc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c index 870cb65b3f21..08c466ebb32b 100644 --- a/arch/sparc/kernel/chmc.c +++ b/arch/sparc/kernel/chmc.c | |||
@@ -392,7 +392,7 @@ static void __devinit jbusmc_construct_dimm_groups(struct jbusmc *p, | |||
392 | } | 392 | } |
393 | } | 393 | } |
394 | 394 | ||
395 | static int __devinit jbusmc_probe(struct of_device *op, | 395 | static int __devinit jbusmc_probe(struct platform_device *op, |
396 | const struct of_device_id *match) | 396 | const struct of_device_id *match) |
397 | { | 397 | { |
398 | const struct linux_prom64_registers *mem_regs; | 398 | const struct linux_prom64_registers *mem_regs; |
@@ -690,7 +690,7 @@ static void chmc_fetch_decode_regs(struct chmc *p) | |||
690 | chmc_read_mcreg(p, CHMCTRL_DECODE4)); | 690 | chmc_read_mcreg(p, CHMCTRL_DECODE4)); |
691 | } | 691 | } |
692 | 692 | ||
693 | static int __devinit chmc_probe(struct of_device *op, | 693 | static int __devinit chmc_probe(struct platform_device *op, |
694 | const struct of_device_id *match) | 694 | const struct of_device_id *match) |
695 | { | 695 | { |
696 | struct device_node *dp = op->dev.of_node; | 696 | struct device_node *dp = op->dev.of_node; |
@@ -765,7 +765,7 @@ out_free: | |||
765 | goto out; | 765 | goto out; |
766 | } | 766 | } |
767 | 767 | ||
768 | static int __devinit us3mc_probe(struct of_device *op, | 768 | static int __devinit us3mc_probe(struct platform_device *op, |
769 | const struct of_device_id *match) | 769 | const struct of_device_id *match) |
770 | { | 770 | { |
771 | if (mc_type == MC_TYPE_SAFARI) | 771 | if (mc_type == MC_TYPE_SAFARI) |
@@ -775,21 +775,21 @@ static int __devinit us3mc_probe(struct of_device *op, | |||
775 | return -ENODEV; | 775 | return -ENODEV; |
776 | } | 776 | } |
777 | 777 | ||
778 | static void __devexit chmc_destroy(struct of_device *op, struct chmc *p) | 778 | static void __devexit chmc_destroy(struct platform_device *op, struct chmc *p) |
779 | { | 779 | { |
780 | list_del(&p->list); | 780 | list_del(&p->list); |
781 | of_iounmap(&op->resource[0], p->regs, 0x48); | 781 | of_iounmap(&op->resource[0], p->regs, 0x48); |
782 | kfree(p); | 782 | kfree(p); |
783 | } | 783 | } |
784 | 784 | ||
785 | static void __devexit jbusmc_destroy(struct of_device *op, struct jbusmc *p) | 785 | static void __devexit jbusmc_destroy(struct platform_device *op, struct jbusmc *p) |
786 | { | 786 | { |
787 | mc_list_del(&p->list); | 787 | mc_list_del(&p->list); |
788 | of_iounmap(&op->resource[0], p->regs, JBUSMC_REGS_SIZE); | 788 | of_iounmap(&op->resource[0], p->regs, JBUSMC_REGS_SIZE); |
789 | kfree(p); | 789 | kfree(p); |
790 | } | 790 | } |
791 | 791 | ||
792 | static int __devexit us3mc_remove(struct of_device *op) | 792 | static int __devexit us3mc_remove(struct platform_device *op) |
793 | { | 793 | { |
794 | void *p = dev_get_drvdata(&op->dev); | 794 | void *p = dev_get_drvdata(&op->dev); |
795 | 795 | ||
@@ -848,7 +848,7 @@ static int __init us3mc_init(void) | |||
848 | ret = register_dimm_printer(us3mc_dimm_printer); | 848 | ret = register_dimm_printer(us3mc_dimm_printer); |
849 | 849 | ||
850 | if (!ret) { | 850 | if (!ret) { |
851 | ret = of_register_driver(&us3mc_driver, &of_bus_type); | 851 | ret = of_register_platform_driver(&us3mc_driver); |
852 | if (ret) | 852 | if (ret) |
853 | unregister_dimm_printer(us3mc_dimm_printer); | 853 | unregister_dimm_printer(us3mc_dimm_printer); |
854 | } | 854 | } |
@@ -859,7 +859,7 @@ static void __exit us3mc_cleanup(void) | |||
859 | { | 859 | { |
860 | if (us3mc_platform()) { | 860 | if (us3mc_platform()) { |
861 | unregister_dimm_printer(us3mc_dimm_printer); | 861 | unregister_dimm_printer(us3mc_dimm_printer); |
862 | of_unregister_driver(&us3mc_driver); | 862 | of_unregister_platform_driver(&us3mc_driver); |
863 | } | 863 | } |
864 | } | 864 | } |
865 | 865 | ||