On Wed, Nov 17, 2010 at 05:50:22PM -0600, Rob Herring wrote:
> From: Rob Herring <[email protected]>
>
> of_bus is deprecated in favor of the plain platform bus. This patch
> converts the ipmi OF driver over to the platform bus.
>
> Signed-off-by: Rob Herring <[email protected]>
Actually, what you need to do is merge the of_platform_driver with the
existing platform_driver. Registering 2 platform_drivers for the same
device doesn't make much sense.
g.
> ---
> drivers/char/ipmi/ipmi_si_intf.c | 36 +++++++++++++++++++++---------------
> 1 files changed, 21 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/char/ipmi/ipmi_si_intf.c
> b/drivers/char/ipmi/ipmi_si_intf.c
> index 7cca8dd..9167e04 100644
> --- a/drivers/char/ipmi/ipmi_si_intf.c
> +++ b/drivers/char/ipmi/ipmi_si_intf.c
> @@ -68,7 +68,6 @@
>
> #ifdef CONFIG_PPC_OF
> #include <linux/of_device.h>
> -#include <linux/of_platform.h>
> #include <linux/of_address.h>
> #include <linux/of_irq.h>
> #endif
> @@ -311,7 +310,7 @@ static int pci_registered;
> static int pnp_registered;
> #endif
> #ifdef CONFIG_PPC_OF
> -static int of_registered;
> +static int plat_registered;
> #endif
>
> static unsigned int kipmid_max_busy_us[SI_MAX_PARMS];
> @@ -2533,13 +2532,13 @@ static struct pci_driver ipmi_pci_driver = {
>
>
> #ifdef CONFIG_PPC_OF
> -static int __devinit ipmi_of_probe(struct platform_device *dev,
> - const struct of_device_id *match)
> +static int __devinit ipmi_plat_probe(struct platform_device *dev)
> {
> struct smi_info *info;
> struct resource resource;
> const __be32 *regsize, *regspacing, *regshift;
> struct device_node *np = dev->dev.of_node;
> + const struct of_device_id *match;
> int ret;
> int proplen;
>
> @@ -2569,6 +2568,13 @@ static int __devinit ipmi_of_probe(struct
> platform_device *dev,
> return -EINVAL;
> }
>
> + match = of_match_device(dev->dev.driver->of_match_table, &dev->dev);
> + if (!match) {
> + dev_err(&dev->dev,
> + "No match for OF device\n");
> + return -ENOMEM;
> + }
> +
> info = kzalloc(sizeof(*info), GFP_KERNEL);
>
> if (!info) {
> @@ -2612,7 +2618,7 @@ static int __devinit ipmi_of_probe(struct
> platform_device *dev,
> return 0;
> }
>
> -static int __devexit ipmi_of_remove(struct platform_device *dev)
> +static int __devexit ipmi_plat_remove(struct platform_device *dev)
> {
> cleanup_one_si(dev_get_drvdata(&dev->dev));
> return 0;
> @@ -2629,14 +2635,14 @@ static struct of_device_id ipmi_match[] =
> {},
> };
>
> -static struct of_platform_driver ipmi_of_platform_driver = {
> +static struct platform_driver ipmi_platform_driver = {
> .driver = {
> - .name = "ipmi",
> + .name = "ipmi-pltfm",
> .owner = THIS_MODULE,
> .of_match_table = ipmi_match,
> },
> - .probe = ipmi_of_probe,
> - .remove = __devexit_p(ipmi_of_remove),
> + .probe = ipmi_plat_probe,
> + .remove = __devexit_p(ipmi_plat_remove),
> };
> #endif /* CONFIG_PPC_OF */
>
> @@ -3376,8 +3382,8 @@ static __devinit int init_ipmi_si(void)
> #endif
>
> #ifdef CONFIG_PPC_OF
> - of_register_platform_driver(&ipmi_of_platform_driver);
> - of_registered = 1;
> + platform_driver_register(&ipmi_platform_driver);
> + plat_registered = 1;
> #endif
>
> /* We prefer devices with interrupts, but in the case of a machine
> @@ -3436,8 +3442,8 @@ static __devinit int init_ipmi_si(void)
> #endif
>
> #ifdef CONFIG_PPC_OF
> - if (of_registered)
> - of_unregister_platform_driver(&ipmi_of_platform_driver);
> + if (plat_registered)
> + platform_driver_unregister(&ipmi_platform_driver);
> #endif
> driver_unregister(&ipmi_driver.driver);
> printk(KERN_WARNING PFX
> @@ -3537,8 +3543,8 @@ static __exit void cleanup_ipmi_si(void)
> #endif
>
> #ifdef CONFIG_PPC_OF
> - if (of_registered)
> - of_unregister_platform_driver(&ipmi_of_platform_driver);
> + if (plat_registered)
> + platform_driver_unregister(&ipmi_platform_driver);
> #endif
>
> mutex_lock(&smi_infos_lock);
> --
> 1.7.1
>
> _______________________________________________
> devicetree-discuss mailing list
> [email protected]
> https://lists.ozlabs.org/listinfo/devicetree-discuss
_______________________________________________
devicetree-discuss mailing list
[email protected]
https://lists.ozlabs.org/listinfo/devicetree-discuss
