Commit 4a3ff8ea authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman

USB

inline cleanup to save a chunk of memory in usb-ohci
parent 4a53529c
...@@ -454,7 +454,7 @@ static int rh_init_int_timer(struct urb * urb); ...@@ -454,7 +454,7 @@ static int rh_init_int_timer(struct urb * urb);
/* Recover a TD/ED using its collision chain */ /* Recover a TD/ED using its collision chain */
static inline void * static void *
dma_to_ed_td (struct hash_list_t * entry, dma_addr_t dma) dma_to_ed_td (struct hash_list_t * entry, dma_addr_t dma)
{ {
struct hash_t * scan = entry->head; struct hash_t * scan = entry->head;
...@@ -465,14 +465,14 @@ dma_to_ed_td (struct hash_list_t * entry, dma_addr_t dma) ...@@ -465,14 +465,14 @@ dma_to_ed_td (struct hash_list_t * entry, dma_addr_t dma)
return scan->virt; return scan->virt;
} }
static inline struct ed * static struct ed *
dma_to_ed (struct ohci * hc, dma_addr_t ed_dma) dma_to_ed (struct ohci * hc, dma_addr_t ed_dma)
{ {
return (struct ed *) dma_to_ed_td(&(hc->ed_hash[ED_HASH_FUNC(ed_dma)]), return (struct ed *) dma_to_ed_td(&(hc->ed_hash[ED_HASH_FUNC(ed_dma)]),
ed_dma); ed_dma);
} }
static inline struct td * static struct td *
dma_to_td (struct ohci * hc, dma_addr_t td_dma) dma_to_td (struct ohci * hc, dma_addr_t td_dma)
{ {
return (struct td *) dma_to_ed_td(&(hc->td_hash[TD_HASH_FUNC(td_dma)]), return (struct td *) dma_to_ed_td(&(hc->td_hash[TD_HASH_FUNC(td_dma)]),
...@@ -480,7 +480,7 @@ dma_to_td (struct ohci * hc, dma_addr_t td_dma) ...@@ -480,7 +480,7 @@ dma_to_td (struct ohci * hc, dma_addr_t td_dma)
} }
/* Add a hash entry for a TD/ED; return true on success */ /* Add a hash entry for a TD/ED; return true on success */
static inline int static int
hash_add_ed_td(struct hash_list_t * entry, void * virt, dma_addr_t dma) hash_add_ed_td(struct hash_list_t * entry, void * virt, dma_addr_t dma)
{ {
struct hash_t * scan; struct hash_t * scan;
...@@ -502,14 +502,14 @@ hash_add_ed_td(struct hash_list_t * entry, void * virt, dma_addr_t dma) ...@@ -502,14 +502,14 @@ hash_add_ed_td(struct hash_list_t * entry, void * virt, dma_addr_t dma)
return 1; return 1;
} }
static inline int static int
hash_add_ed (struct ohci * hc, struct ed * ed) hash_add_ed (struct ohci * hc, struct ed * ed)
{ {
return hash_add_ed_td (&(hc->ed_hash[ED_HASH_FUNC(ed->dma)]), return hash_add_ed_td (&(hc->ed_hash[ED_HASH_FUNC(ed->dma)]),
ed, ed->dma); ed, ed->dma);
} }
static inline int static int
hash_add_td (struct ohci * hc, struct td * td) hash_add_td (struct ohci * hc, struct td * td)
{ {
return hash_add_ed_td (&(hc->td_hash[TD_HASH_FUNC(td->td_dma)]), return hash_add_ed_td (&(hc->td_hash[TD_HASH_FUNC(td->td_dma)]),
...@@ -517,7 +517,7 @@ hash_add_td (struct ohci * hc, struct td * td) ...@@ -517,7 +517,7 @@ hash_add_td (struct ohci * hc, struct td * td)
} }
static inline void static void
hash_free_ed_td (struct hash_list_t * entry, void * virt) hash_free_ed_td (struct hash_list_t * entry, void * virt)
{ {
struct hash_t *scan, *prev; struct hash_t *scan, *prev;
...@@ -543,13 +543,13 @@ hash_free_ed_td (struct hash_list_t * entry, void * virt) ...@@ -543,13 +543,13 @@ hash_free_ed_td (struct hash_list_t * entry, void * virt)
} }
} }
static inline void static void
hash_free_ed (struct ohci * hc, struct ed * ed) hash_free_ed (struct ohci * hc, struct ed * ed)
{ {
hash_free_ed_td (&(hc->ed_hash[ED_HASH_FUNC(ed->dma)]), ed); hash_free_ed_td (&(hc->ed_hash[ED_HASH_FUNC(ed->dma)]), ed);
} }
static inline void static void
hash_free_td (struct ohci * hc, struct td * td) hash_free_td (struct ohci * hc, struct td * td)
{ {
hash_free_ed_td (&(hc->td_hash[TD_HASH_FUNC(td->td_dma)]), td); hash_free_ed_td (&(hc->td_hash[TD_HASH_FUNC(td->td_dma)]), td);
...@@ -588,7 +588,7 @@ static void ohci_mem_cleanup (struct ohci *ohci) ...@@ -588,7 +588,7 @@ static void ohci_mem_cleanup (struct ohci *ohci)
} }
/* TDs ... */ /* TDs ... */
static inline struct td * static struct td *
td_alloc (struct ohci *hc, int mem_flags) td_alloc (struct ohci *hc, int mem_flags)
{ {
dma_addr_t dma; dma_addr_t dma;
...@@ -616,7 +616,7 @@ td_free (struct ohci *hc, struct td *td) ...@@ -616,7 +616,7 @@ td_free (struct ohci *hc, struct td *td)
/* DEV + EDs ... only the EDs need to be consistent */ /* DEV + EDs ... only the EDs need to be consistent */
static inline struct ohci_device * static struct ohci_device *
dev_alloc (struct ohci *hc, int mem_flags) dev_alloc (struct ohci *hc, int mem_flags)
{ {
dma_addr_t dma; dma_addr_t dma;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment