>>>>> "Daniel" == Daniel Mack <zonque@xxxxxxxxx> writes: Daniel> Let the function declarations live in the header files they belong to, Daniel> which makes it easier to stub them out later. Daniel> Signed-off-by: Daniel Mack <zonque@xxxxxxxxx> Acked-by: Peter Korsgaard <jacmet@xxxxxxxxxx> Daniel> --- Daniel> drivers/usb/musb/musb_core.h | 17 ----------------- Daniel> drivers/usb/musb/musb_gadget.h | 17 +++++++++++------ Daniel> drivers/usb/musb/musb_host.h | 4 +++- Daniel> 3 files changed, 14 insertions(+), 24 deletions(-) Daniel> diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h Daniel> index 7fb4819..04d8974 100644 Daniel> --- a/drivers/usb/musb/musb_core.h Daniel> +++ b/drivers/usb/musb/musb_core.h Daniel> @@ -82,23 +82,6 @@ struct musb_ep; Daniel> #define MUSB_CONFIG_PROC_FS Daniel> #endif Daniel> -/****************************** PERIPHERAL ROLE *****************************/ Daniel> - Daniel> -extern irqreturn_t musb_g_ep0_irq(struct musb *); Daniel> -extern void musb_g_tx(struct musb *, u8); Daniel> -extern void musb_g_rx(struct musb *, u8); Daniel> -extern void musb_g_reset(struct musb *); Daniel> -extern void musb_g_suspend(struct musb *); Daniel> -extern void musb_g_resume(struct musb *); Daniel> -extern void musb_g_wakeup(struct musb *); Daniel> -extern void musb_g_disconnect(struct musb *); Daniel> - Daniel> -/****************************** HOST ROLE ***********************************/ Daniel> - Daniel> -extern irqreturn_t musb_h_ep0_irq(struct musb *); Daniel> -extern void musb_host_tx(struct musb *, u8); Daniel> -extern void musb_host_rx(struct musb *, u8); Daniel> - Daniel> /****************************** CONSTANTS ********************************/ Daniel> #ifndef MUSB_C_NUM_EPS Daniel> diff --git a/drivers/usb/musb/musb_gadget.h b/drivers/usb/musb/musb_gadget.h Daniel> index 66b7c5e..75f821c 100644 Daniel> --- a/drivers/usb/musb/musb_gadget.h Daniel> +++ b/drivers/usb/musb/musb_gadget.h Daniel> @@ -37,6 +37,17 @@ Daniel> #include <linux/list.h> Daniel> +extern irqreturn_t musb_g_ep0_irq(struct musb *); Daniel> +extern void musb_g_tx(struct musb *, u8); Daniel> +extern void musb_g_rx(struct musb *, u8); Daniel> +extern void musb_g_reset(struct musb *); Daniel> +extern void musb_g_suspend(struct musb *); Daniel> +extern void musb_g_resume(struct musb *); Daniel> +extern void musb_g_wakeup(struct musb *); Daniel> +extern void musb_g_disconnect(struct musb *); Daniel> +extern void musb_gadget_cleanup(struct musb *); Daniel> +extern int musb_gadget_setup(struct musb *); Daniel> + Daniel> enum buffer_map_state { Daniel> UN_MAPPED = 0, Daniel> PRE_MAPPED, Daniel> @@ -106,14 +117,8 @@ static inline struct musb_request *next_request(struct musb_ep *ep) Daniel> return container_of(queue->next, struct musb_request, list); Daniel> } Daniel> -extern void musb_g_tx(struct musb *musb, u8 epnum); Daniel> -extern void musb_g_rx(struct musb *musb, u8 epnum); Daniel> - Daniel> extern const struct usb_ep_ops musb_g_ep0_ops; Daniel> -extern int musb_gadget_setup(struct musb *); Daniel> -extern void musb_gadget_cleanup(struct musb *); Daniel> - Daniel> extern void musb_g_giveback(struct musb_ep *, struct usb_request *, int); Daniel> extern void musb_ep_restart(struct musb *, struct musb_request *); Daniel> diff --git a/drivers/usb/musb/musb_host.h b/drivers/usb/musb/musb_host.h Daniel> index 5a9c8fe..9670269 100644 Daniel> --- a/drivers/usb/musb/musb_host.h Daniel> +++ b/drivers/usb/musb/musb_host.h Daniel> @@ -84,7 +84,9 @@ static inline struct musb_qh *first_qh(struct list_head *q) Daniel> return list_entry(q->next, struct musb_qh, ring); Daniel> } Daniel> - Daniel> +extern irqreturn_t musb_h_ep0_irq(struct musb *); Daniel> +extern void musb_host_tx(struct musb *, u8); Daniel> +extern void musb_host_rx(struct musb *, u8); Daniel> extern void musb_root_disconnect(struct musb *musb); Daniel> struct usb_hcd; Daniel> -- Daniel> 1.8.1.4 -- Bye, Peter Korsgaard -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html