From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <4D653C48.4090608@gmail.com> Date: Wed, 23 Feb 2011 10:56:40 -0600 From: Rob Herring MIME-Version: 1.0 To: Grant Likely Subject: Re: [RFC PATCH 14/15] dt: Eliminate of_platform_{,un}register_driver References: <20110223043015.20795.37090.stgit@localhost6.localdomain6> <20110223043447.20795.80653.stgit@localhost6.localdomain6> In-Reply-To: <20110223043447.20795.80653.stgit@localhost6.localdomain6> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Cc: sfr@canb.auug.org.au, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, davem@davemloft.net List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Grant, On 02/22/2011 10:34 PM, Grant Likely wrote: > Final step to eliminate of_platform_bus_type. They're all just > platform drivers now. > > Signed-off-by: Grant Likely > --- snip > diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c > index b6ae6e9..132951d 100644 > --- a/drivers/char/ipmi/ipmi_si_intf.c > +++ b/drivers/char/ipmi/ipmi_si_intf.c > @@ -2556,8 +2556,7 @@ 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_of_probe(struct platform_device *dev) > { > struct smi_info *info; > struct resource resource; > @@ -2568,6 +2567,9 @@ static int __devinit ipmi_of_probe(struct platform_device *dev, > > dev_info(&dev->dev, "probing via device tree\n"); > > + if (!dev->dev.of_match) > + return -EINVAL; > + > ret = of_address_to_resource(np, 0,&resource); > if (ret) { > dev_warn(&dev->dev, PFX "invalid address from OF\n"); > @@ -2600,7 +2602,7 @@ static int __devinit ipmi_of_probe(struct platform_device *dev, > return -ENOMEM; > } > > - info->si_type = (enum si_type) match->data; > + info->si_type = (enum si_type) dev->dev.of_match->data; > info->addr_source = SI_DEVICETREE; > info->irq_setup = std_irq_setup; > > @@ -2652,9 +2654,9 @@ static struct of_device_id ipmi_match[] = > {}, > }; > > -static struct of_platform_driver ipmi_of_platform_driver = { > +static struct platform_driver ipmi_of_platform_driver = { > .driver = { > - .name = "ipmi", > + .name = "of-ipmi", > .owner = THIS_MODULE, > .of_match_table = ipmi_match, > }, > @@ -3396,7 +3398,7 @@ static int __devinit init_ipmi_si(void) > #endif > > #ifdef CONFIG_PPC_OF > - of_register_platform_driver(&ipmi_of_platform_driver); > + platform_driver_register(&ipmi_of_platform_driver); > of_registered = 1; > #endif > > @@ -3457,7 +3459,7 @@ static int __devinit init_ipmi_si(void) > > #ifdef CONFIG_PPC_OF > if (of_registered) > - of_unregister_platform_driver(&ipmi_of_platform_driver); > + platform_driver_unregister(&ipmi_of_platform_driver); > #endif > driver_unregister(&ipmi_driver.driver); > printk(KERN_WARNING PFX > @@ -3558,7 +3560,7 @@ static void __exit cleanup_ipmi_si(void) > > #ifdef CONFIG_PPC_OF > if (of_registered) > - of_unregister_platform_driver(&ipmi_of_platform_driver); > + platform_driver_unregister(&ipmi_of_platform_driver); > #endif > > mutex_lock(&smi_infos_lock); Um, you are doing exactly what you said I should not do. Now the driver has 2 platform drivers defined. I have an updated patch that addresses your previous comments. I will send it out later today. Rob