X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2Fhost%2Fehci-mem.c;h=9938697ff361372e62814f45f48d4393566147ac;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=31f311d53b05c212e79eec356d0d424192bb2f3d;hpb=9bf4aaab3e101692164d49b7ca357651eb691cb6;p=linux-2.6.git diff --git a/drivers/usb/host/ehci-mem.c b/drivers/usb/host/ehci-mem.c index 31f311d53..9938697ff 100644 --- a/drivers/usb/host/ehci-mem.c +++ b/drivers/usb/host/ehci-mem.c @@ -31,30 +31,6 @@ * No memory seen by this driver is pageable. */ -/*-------------------------------------------------------------------------*/ -/* - * Allocator / cleanup for the per device structure - * Called by hcd init / removal code - */ -static struct usb_hcd *ehci_hcd_alloc (void) -{ - struct ehci_hcd *ehci; - - ehci = (struct ehci_hcd *) - kmalloc (sizeof (struct ehci_hcd), GFP_KERNEL); - if (ehci != 0) { - memset (ehci, 0, sizeof (struct ehci_hcd)); - ehci->hcd.product_desc = "EHCI Host Controller"; - return &ehci->hcd; - } - 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 */ @@ -75,7 +51,7 @@ static struct ehci_qtd *ehci_qtd_alloc (struct ehci_hcd *ehci, int flags) dma_addr_t dma; qtd = dma_pool_alloc (ehci->qtd_pool, flags, &dma); - if (qtd != 0) { + if (qtd != NULL) { ehci_qtd_init (qtd, dma); } return qtd; @@ -114,7 +90,7 @@ static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, int flags) return qh; memset (qh, 0, sizeof *qh); - kref_init(&qh->kref, qh_destroy); + kref_init(&qh->kref); qh->ehci = ehci; qh->qh_dma = dma; // INIT_LIST_HEAD (&qh->qh_list); @@ -122,7 +98,7 @@ static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, int flags) /* dummy td enables safe urb queuing */ qh->dummy = ehci_qtd_alloc (ehci, flags); - if (qh->dummy == 0) { + if (qh->dummy == NULL) { ehci_dbg (ehci, "no dummy td\n"); dma_pool_free (ehci->qh_pool, qh, qh->qh_dma); qh = NULL; @@ -139,7 +115,7 @@ static inline struct ehci_qh *qh_get (struct ehci_qh *qh) static inline void qh_put (struct ehci_qh *qh) { - kref_put(&qh->kref); + kref_put(&qh->kref, qh_destroy); } /*-------------------------------------------------------------------------*/ @@ -174,7 +150,7 @@ static void ehci_mem_cleanup (struct ehci_hcd *ehci) ehci->sitd_pool = NULL; if (ehci->periodic) - dma_free_coherent (ehci->hcd.self.controller, + dma_free_coherent (ehci_to_hcd(ehci)->self.controller, ehci->periodic_size * sizeof (u32), ehci->periodic, ehci->periodic_dma); ehci->periodic = NULL; @@ -192,7 +168,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, int flags) /* QTDs for control/bulk/intr transfers */ ehci->qtd_pool = dma_pool_create ("ehci_qtd", - ehci->hcd.self.controller, + ehci_to_hcd(ehci)->self.controller, sizeof (struct ehci_qtd), 32 /* byte alignment (for hw parts) */, 4096 /* can't cross 4K */); @@ -202,7 +178,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, int flags) /* QHs for control/bulk/intr transfers */ ehci->qh_pool = dma_pool_create ("ehci_qh", - ehci->hcd.self.controller, + ehci_to_hcd(ehci)->self.controller, sizeof (struct ehci_qh), 32 /* byte alignment (for hw parts) */, 4096 /* can't cross 4K */); @@ -216,7 +192,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, int flags) /* ITD for high speed ISO transfers */ ehci->itd_pool = dma_pool_create ("ehci_itd", - ehci->hcd.self.controller, + ehci_to_hcd(ehci)->self.controller, sizeof (struct ehci_itd), 32 /* byte alignment (for hw parts) */, 4096 /* can't cross 4K */); @@ -226,7 +202,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, int flags) /* SITD for full/low speed split ISO transfers */ ehci->sitd_pool = dma_pool_create ("ehci_sitd", - ehci->hcd.self.controller, + ehci_to_hcd(ehci)->self.controller, sizeof (struct ehci_sitd), 32 /* byte alignment (for hw parts) */, 4096 /* can't cross 4K */); @@ -235,11 +211,11 @@ static int ehci_mem_init (struct ehci_hcd *ehci, int flags) } /* Hardware periodic table */ - ehci->periodic = (u32 *) - dma_alloc_coherent (ehci->hcd.self.controller, - ehci->periodic_size * sizeof (u32), + ehci->periodic = (__le32 *) + dma_alloc_coherent (ehci_to_hcd(ehci)->self.controller, + ehci->periodic_size * sizeof(__le32), &ehci->periodic_dma, 0); - if (ehci->periodic == 0) { + if (ehci->periodic == NULL) { goto fail; } for (i = 0; i < ehci->periodic_size; i++) @@ -247,7 +223,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, int flags) /* software shadow of hardware table */ ehci->pshadow = kmalloc (ehci->periodic_size * sizeof (void *), flags); - if (ehci->pshadow == 0) { + if (ehci->pshadow == NULL) { goto fail; } memset (ehci->pshadow, 0, ehci->periodic_size * sizeof (void *));