Attachment 312543 Details for Bug 455843 – proposed patch

[patch] proposed patch

123.patch (text/plain), 5.60 KB, created by Vitaly Mayatskikh on 2008-07-24 11:43:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vitaly Mayatskikh

Created: 2008-07-24 11:43:00 UTC

Size: 5.60 KB

patch

obsolete

>diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
>index 550608c..4fb6395 100644
>--- a/drivers/usb/core/hcd-pci.c
>+++ b/drivers/usb/core/hcd-pci.c
>@@ -38,14 +38,6 @@
> 
> /*-------------------------------------------------------------------------*/
> 
>-static void hcd_pci_release(struct usb_bus *bus)
>-{
>-	struct usb_hcd *hcd = bus->hcpriv;
>-
>-	if (hcd)
>-		hcd->driver->hcd_free(hcd);
>-}
>-
> /* configure so an HC device and id are always provided */
> /* always called with process context; sleeping is OK */
> 
>@@ -195,7 +187,7 @@ clean_3:
> 	usb_bus_init (&hcd->self);
> 	hcd->self.op = &usb_hcd_operations;
> 	hcd->self.hcpriv = (void *) hcd;
>-	hcd->self.release = &hcd_pci_release;
>+	hcd->self.release = &usb_hcd_release;
> 	init_timer (&hcd->rh_timer);
> 
> 	INIT_LIST_HEAD (&hcd->dev_list);
>diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
>index 5047d35..9315936 100644
>--- a/drivers/usb/core/hcd.c
>+++ b/drivers/usb/core/hcd.c
>@@ -1625,3 +1625,13 @@ void usb_hc_died (struct usb_hcd *hcd)
> }
> EXPORT_SYMBOL (usb_hc_died);
> 
>+
>+void usb_hcd_release(struct usb_bus *bus)
>+{
>+        struct usb_hcd *hcd;
>+
>+        hcd = container_of (bus, struct usb_hcd, self);
>+        kfree(hcd);
>+}
>+
>+EXPORT_SYMBOL (usb_hcd_release);
>diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
>index 340977b..199095d 100644
>--- a/drivers/usb/core/hcd.h
>+++ b/drivers/usb/core/hcd.h
>@@ -349,6 +349,8 @@ extern void usb_deregister_bus (struct usb_bus *);
> extern int usb_register_root_hub (struct usb_device *usb_dev,
> 		struct device *parent_dev);
> 
>+extern void usb_hcd_release (struct usb_bus *);
>+
> static inline int hcd_register_root (struct usb_device *usb_dev,
> 		struct usb_hcd *hcd)
> {
>diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
>index 514eabe..846a9af 100644
>--- a/drivers/usb/host/ehci-hcd.c
>+++ b/drivers/usb/host/ehci-hcd.c
>@@ -1146,7 +1146,7 @@ static const struct hc_driver ehci_driver = {
> 	 * memory lifecycle (except per-request)
> 	 */
> 	.hcd_alloc =		ehci_hcd_alloc,
>-	.hcd_free =		ehci_hcd_free,
>+	.hcd_free =		usb_hcd_release,
> 
> 	/*
> 	 * managing i/o requests and associated device resources
>diff --git a/drivers/usb/host/ehci-mem.c b/drivers/usb/host/ehci-mem.c
>index beee4d9..e81f61c 100644
>--- a/drivers/usb/host/ehci-mem.c
>+++ b/drivers/usb/host/ehci-mem.c
>@@ -50,11 +50,6 @@ static struct usb_hcd *ehci_hcd_alloc (void)
> 	return NULL;
> }
> 
>-static void ehci_hcd_free (struct usb_hcd *hcd)
>-{
>-	kfree (hcd_to_ehci (hcd));
>-}
>-
> /*-------------------------------------------------------------------------*/
> 
> /* Allocate the key transfer structures from the previously allocated pool */
>diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c
>index 4e11a8e..64d67eb 100644
>--- a/drivers/usb/host/ohci-lh7a404.c
>+++ b/drivers/usb/host/ohci-lh7a404.c
>@@ -289,7 +289,7 @@ static const struct hc_driver ohci_lh7a404_hc_driver = {
> 	 * memory lifecycle (except per-request)
> 	 */
> 	.hcd_alloc =		ohci_hcd_alloc,
>-	.hcd_free =		ohci_hcd_free,
>+	.hcd_free =		usb_hcd_release,
> 
> 	/*
> 	 * managing i/o requests and associated device resources
>diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c
>index 1341936..900f5ff 100644
>--- a/drivers/usb/host/ohci-mem.c
>+++ b/drivers/usb/host/ohci-mem.c
>@@ -40,11 +40,6 @@ static struct usb_hcd *ohci_hcd_alloc (void)
> 	return NULL;
> }
> 
>-static void ohci_hcd_free (struct usb_hcd *hcd)
>-{
>-	kfree (hcd_to_ohci (hcd));
>-}
>-
> /*-------------------------------------------------------------------------*/
> 
> static int ohci_mem_init (struct ohci_hcd *ohci)
>diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
>index d133ff2..b60a70c 100644
>--- a/drivers/usb/host/ohci-omap.c
>+++ b/drivers/usb/host/ohci-omap.c
>@@ -486,7 +486,7 @@ static const struct hc_driver ohci_omap_hc_driver = {
> 	 * memory lifecycle (except per-request)
> 	 */
> 	.hcd_alloc =		ohci_hcd_alloc,
>-	.hcd_free =		ohci_hcd_free,
>+	.hcd_free =		usb_hcd_release,
> 
> 	/*
> 	 * managing i/o requests and associated device resources
>diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
>index 73d9aee..18c5d40 100644
>--- a/drivers/usb/host/ohci-pci.c
>+++ b/drivers/usb/host/ohci-pci.c
>@@ -219,7 +219,7 @@ static const struct hc_driver ohci_pci_hc_driver = {
> 	 * memory lifecycle (except per-request)
> 	 */
> 	.hcd_alloc =		ohci_hcd_alloc,
>-	.hcd_free =		ohci_hcd_free,
>+	.hcd_free =		usb_hcd_release,
> 
> 	/*
> 	 * managing i/o requests and associated device resources
>diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
>index c3cd76a..51cbb52 100644
>--- a/drivers/usb/host/ohci-sa1111.c
>+++ b/drivers/usb/host/ohci-sa1111.c
>@@ -327,7 +327,7 @@ static const struct hc_driver ohci_sa1111_hc_driver = {
> 	 * memory lifecycle (except per-request)
> 	 */
> 	.hcd_alloc =		ohci_hcd_alloc,
>-	.hcd_free =		ohci_hcd_free,
>+	.hcd_free =		usb_hcd_release,
> 
> 	/*
> 	 * managing i/o requests and associated device resources
>diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
>index 120c63c..4caf8f9 100644
>--- a/drivers/usb/host/uhci-hcd.c
>+++ b/drivers/usb/host/uhci-hcd.c
>@@ -2438,11 +2438,6 @@ static struct usb_hcd *uhci_hcd_alloc(void)
> 	return &uhci->hcd;
> }
> 
>-static void uhci_hcd_free(struct usb_hcd *hcd)
>-{
>-	kfree(hcd_to_uhci(hcd));
>-}
>-
> /* Are there any URBs for a particular device/endpoint on a given list? */
> static int urbs_for_ep_list(struct list_head *head,
> 		struct hcd_dev *hdev, int ep)
>@@ -2520,7 +2515,7 @@ static const struct hc_driver uhci_driver = {
> 	.stop =			uhci_stop,
> 
> 	.hcd_alloc =		uhci_hcd_alloc,
>-	.hcd_free =		uhci_hcd_free,
>+	.hcd_free =		usb_hcd_release,
> 
> 	.urb_enqueue =		uhci_urb_enqueue,
> 	.urb_dequeue =		uhci_urb_dequeue,

Actions: View | Diff

Attachments on bug 455843: 312538 | 312543 | 321570 | 323322 | 325952