From: Russell King - ARM Linux <linux@arm.linux.org.uk> To: "Heiko Stübner" <heiko@sntech.de>, "Greg KH" <greg@kroah.com> Cc: Felipe Balbi <balbi@ti.com>, Kukjin Kim <kgene.kim@samsung.com>, linux-samsung-soc@vger.kernel.org, linux-usb@vger.kernel.org, Thomas Abraham <thomas.abraham@linaro.org>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 5/7] s3c-hsudc: move device registration to probe and remove Date: Sun, 18 Dec 2011 08:09:07 +0000 [thread overview] Message-ID: <20111218080907.GR14542@n2100.arm.linux.org.uk> (raw) In-Reply-To: <201112172028.34509.heiko@sntech.de> On Sat, Dec 17, 2011 at 08:28:34PM +0100, Heiko Stübner wrote: > Instead of adding and deleting the gadget device in the start and stop > invocations. Use device_register in the probe method to initialize > and add the gadget device and unregister it in the remove function. > > This also requires a release function for the gadget device. Ouch. This is a sure sign that your code is broken. The lifetime of a device structure is rather indeterminant, and modules should not contain release functions for these. > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > drivers/usb/gadget/s3c-hsudc.c | 27 ++++++++++++++++++--------- > 1 files changed, 18 insertions(+), 9 deletions(-) > > diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c > index 06ca8c4..fa2ae7a 100644 > --- a/drivers/usb/gadget/s3c-hsudc.c > +++ b/drivers/usb/gadget/s3c-hsudc.c > @@ -1156,11 +1156,6 @@ static int s3c_hsudc_start(struct usb_gadget_driver *driver, > hsudc->driver = driver; > hsudc->gadget.dev.driver = &driver->driver; > hsudc->gadget.speed = USB_SPEED_UNKNOWN; > - ret = device_add(&hsudc->gadget.dev); > - if (ret) { > - dev_err(hsudc->dev, "failed to probe gadget device"); > - return ret; > - } > > ret = bind(&hsudc->gadget); > if (ret) { > @@ -1180,8 +1175,6 @@ static int s3c_hsudc_start(struct usb_gadget_driver *driver, > hsudc->gadget.name); > driver->unbind(&hsudc->gadget); > > - device_del(&hsudc->gadget.dev); > - > hsudc->driver = NULL; > hsudc->gadget.dev.driver = NULL; > return ret; > @@ -1222,7 +1215,6 @@ static int s3c_hsudc_stop(struct usb_gadget_driver *driver) > (void) otg_set_peripheral(hsudc->transceiver, NULL); > > driver->unbind(&hsudc->gadget); > - device_del(&hsudc->gadget.dev); > disable_irq(hsudc->irq); > > dev_info(hsudc->dev, "unregistered gadget driver '%s'\n", > @@ -1260,6 +1252,13 @@ static struct usb_gadget_ops s3c_hsudc_gadget_ops = { > .vbus_draw = s3c_hsudc_vbus_draw, > }; > > +/* The gadget structure is stored inside the hsudc structure and will be > + * released along with it. */ > +static void s3c_hsudc_gadget_release(struct device *dev) > +{ > + return; > +} > + > static int __devinit s3c_hsudc_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -1307,7 +1306,6 @@ static int __devinit s3c_hsudc_probe(struct platform_device *pdev) > > spin_lock_init(&hsudc->lock); > > - device_initialize(&hsudc->gadget.dev); > dev_set_name(&hsudc->gadget.dev, "gadget"); > > hsudc->gadget.max_speed = USB_SPEED_HIGH; > @@ -1315,6 +1313,7 @@ static int __devinit s3c_hsudc_probe(struct platform_device *pdev) > hsudc->gadget.name = dev_name(dev); > hsudc->gadget.dev.parent = dev; > hsudc->gadget.dev.dma_mask = dev->dma_mask; > + hsudc->gadget.dev.release = s3c_hsudc_gadget_release; > hsudc->gadget.ep0 = &hsudc->ep[0].ep; > > hsudc->gadget.is_otg = 0; > @@ -1348,12 +1347,20 @@ static int __devinit s3c_hsudc_probe(struct platform_device *pdev) > disable_irq(hsudc->irq); > local_irq_enable(); > > + ret = device_register(&hsudc->gadget.dev); > + if (ret) { > + put_device(&hsudc->gadget.dev); > + goto err_add_device; > + } > + > ret = usb_add_gadget_udc(&pdev->dev, &hsudc->gadget); > if (ret) > goto err_add_udc; > > return 0; > err_add_udc: > + device_unregister(&hsudc->gadget.dev); > +err_add_device: > clk_disable(hsudc->uclk); > clk_put(hsudc->uclk); > err_clk: > @@ -1379,6 +1386,8 @@ static int __devexit s3c_hsudc_remove(struct platform_device *pdev) > > usb_del_gadget_udc(&hsudc->gadget); > > + device_unregister(&hsudc->gadget.dev); > + > clk_disable(hsudc->uclk); > clk_put(hsudc->uclk); > > -- > 1.7.2.3 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: linux@arm.linux.org.uk (Russell King - ARM Linux) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/7] s3c-hsudc: move device registration to probe and remove Date: Sun, 18 Dec 2011 08:09:07 +0000 [thread overview] Message-ID: <20111218080907.GR14542@n2100.arm.linux.org.uk> (raw) In-Reply-To: <201112172028.34509.heiko@sntech.de> On Sat, Dec 17, 2011 at 08:28:34PM +0100, Heiko St?bner wrote: > Instead of adding and deleting the gadget device in the start and stop > invocations. Use device_register in the probe method to initialize > and add the gadget device and unregister it in the remove function. > > This also requires a release function for the gadget device. Ouch. This is a sure sign that your code is broken. The lifetime of a device structure is rather indeterminant, and modules should not contain release functions for these. > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > drivers/usb/gadget/s3c-hsudc.c | 27 ++++++++++++++++++--------- > 1 files changed, 18 insertions(+), 9 deletions(-) > > diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c > index 06ca8c4..fa2ae7a 100644 > --- a/drivers/usb/gadget/s3c-hsudc.c > +++ b/drivers/usb/gadget/s3c-hsudc.c > @@ -1156,11 +1156,6 @@ static int s3c_hsudc_start(struct usb_gadget_driver *driver, > hsudc->driver = driver; > hsudc->gadget.dev.driver = &driver->driver; > hsudc->gadget.speed = USB_SPEED_UNKNOWN; > - ret = device_add(&hsudc->gadget.dev); > - if (ret) { > - dev_err(hsudc->dev, "failed to probe gadget device"); > - return ret; > - } > > ret = bind(&hsudc->gadget); > if (ret) { > @@ -1180,8 +1175,6 @@ static int s3c_hsudc_start(struct usb_gadget_driver *driver, > hsudc->gadget.name); > driver->unbind(&hsudc->gadget); > > - device_del(&hsudc->gadget.dev); > - > hsudc->driver = NULL; > hsudc->gadget.dev.driver = NULL; > return ret; > @@ -1222,7 +1215,6 @@ static int s3c_hsudc_stop(struct usb_gadget_driver *driver) > (void) otg_set_peripheral(hsudc->transceiver, NULL); > > driver->unbind(&hsudc->gadget); > - device_del(&hsudc->gadget.dev); > disable_irq(hsudc->irq); > > dev_info(hsudc->dev, "unregistered gadget driver '%s'\n", > @@ -1260,6 +1252,13 @@ static struct usb_gadget_ops s3c_hsudc_gadget_ops = { > .vbus_draw = s3c_hsudc_vbus_draw, > }; > > +/* The gadget structure is stored inside the hsudc structure and will be > + * released along with it. */ > +static void s3c_hsudc_gadget_release(struct device *dev) > +{ > + return; > +} > + > static int __devinit s3c_hsudc_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -1307,7 +1306,6 @@ static int __devinit s3c_hsudc_probe(struct platform_device *pdev) > > spin_lock_init(&hsudc->lock); > > - device_initialize(&hsudc->gadget.dev); > dev_set_name(&hsudc->gadget.dev, "gadget"); > > hsudc->gadget.max_speed = USB_SPEED_HIGH; > @@ -1315,6 +1313,7 @@ static int __devinit s3c_hsudc_probe(struct platform_device *pdev) > hsudc->gadget.name = dev_name(dev); > hsudc->gadget.dev.parent = dev; > hsudc->gadget.dev.dma_mask = dev->dma_mask; > + hsudc->gadget.dev.release = s3c_hsudc_gadget_release; > hsudc->gadget.ep0 = &hsudc->ep[0].ep; > > hsudc->gadget.is_otg = 0; > @@ -1348,12 +1347,20 @@ static int __devinit s3c_hsudc_probe(struct platform_device *pdev) > disable_irq(hsudc->irq); > local_irq_enable(); > > + ret = device_register(&hsudc->gadget.dev); > + if (ret) { > + put_device(&hsudc->gadget.dev); > + goto err_add_device; > + } > + > ret = usb_add_gadget_udc(&pdev->dev, &hsudc->gadget); > if (ret) > goto err_add_udc; > > return 0; > err_add_udc: > + device_unregister(&hsudc->gadget.dev); > +err_add_device: > clk_disable(hsudc->uclk); > clk_put(hsudc->uclk); > err_clk: > @@ -1379,6 +1386,8 @@ static int __devexit s3c_hsudc_remove(struct platform_device *pdev) > > usb_del_gadget_udc(&hsudc->gadget); > > + device_unregister(&hsudc->gadget.dev); > + > clk_disable(hsudc->uclk); > clk_put(hsudc->uclk); > > -- > 1.7.2.3 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2011-12-18 8:09 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-12-17 19:23 [PATCH v2 0/7] s3c-hsudc: regulator handling and a lot of fixes Heiko Stübner 2011-12-17 19:23 ` Heiko Stübner 2011-12-17 19:24 ` [PATCH 1/7] s3c-hsudc: move platform_data struct to global header Heiko Stübner 2011-12-17 19:24 ` Heiko Stübner 2011-12-17 19:25 ` [PATCH 2/7] s3c-hsudc: add __devinit to probe function Heiko Stübner 2011-12-17 19:25 ` Heiko Stübner 2011-12-17 19:26 ` [PATCH 3/7] s3c-hsudc: add a remove function Heiko Stübner 2011-12-17 19:26 ` Heiko Stübner 2011-12-18 8:03 ` Russell King - ARM Linux 2011-12-18 8:03 ` Russell King - ARM Linux 2011-12-18 8:10 ` Russell King - ARM Linux 2011-12-18 8:10 ` Russell King - ARM Linux 2011-12-18 9:42 ` Heiko Stübner 2011-12-18 9:42 ` Heiko Stübner 2011-12-18 13:44 ` Heiko Stübner 2011-12-18 13:44 ` Heiko Stübner 2011-12-18 14:43 ` Russell King - ARM Linux 2011-12-18 14:43 ` Russell King - ARM Linux 2011-12-18 18:50 ` Heiko Stübner 2011-12-18 18:50 ` Heiko Stübner [not found] ` <201112181950.38993.heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> 2011-12-18 19:01 ` Russell King - ARM Linux 2011-12-18 19:01 ` Russell King - ARM Linux 2011-12-18 19:33 ` Heiko Stübner 2011-12-18 19:33 ` Heiko Stübner 2011-12-18 19:45 ` Russell King - ARM Linux 2011-12-18 19:45 ` Russell King - ARM Linux 2011-12-18 20:24 ` Heiko Stübner 2011-12-18 20:24 ` Heiko Stübner [not found] ` <201112182124.13313.heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> 2011-12-18 20:39 ` Russell King - ARM Linux 2011-12-18 20:39 ` Russell King - ARM Linux [not found] ` <20111218203953.GY14542-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org> 2011-12-18 20:46 ` Heiko Stübner 2011-12-18 20:46 ` Heiko Stübner 2011-12-18 21:37 ` Russell King - ARM Linux 2011-12-18 21:37 ` Russell King - ARM Linux [not found] ` <20111218213704.GZ14542-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org> 2011-12-20 6:08 ` Greg KH 2011-12-20 6:08 ` Greg KH 2011-12-20 6:07 ` Greg KH 2011-12-20 6:07 ` Greg KH 2011-12-17 19:27 ` [PATCH 4/7] s3c-hsudc: add missing otg_put_transceiver in probe Heiko Stübner 2011-12-17 19:27 ` Heiko Stübner 2011-12-17 19:28 ` [PATCH 5/7] s3c-hsudc: move device registration to probe and remove Heiko Stübner 2011-12-17 19:28 ` Heiko Stübner 2011-12-18 8:09 ` Russell King - ARM Linux [this message] 2011-12-18 8:09 ` Russell King - ARM Linux [not found] ` <201112172023.05519.heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> 2011-12-17 19:29 ` [PATCH 6/7] s3c-hsudc: use udc_start and udc_stop functions Heiko Stübner 2011-12-17 19:29 ` Heiko Stübner 2011-12-17 19:30 ` [PATCH 7/7] s3c-hsudc: Add regulator handling Heiko Stübner 2011-12-17 19:30 ` Heiko Stübner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20111218080907.GR14542@n2100.arm.linux.org.uk \ --to=linux@arm.linux.org.uk \ --cc=balbi@ti.com \ --cc=greg@kroah.com \ --cc=heiko@sntech.de \ --cc=kgene.kim@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=thomas.abraham@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.