Dmitry,
Before I accept this patch, I'd like you to double check that those
lines weren't effected by any of the performance patches I did last
summer. I can't remember if those functions were inlined because of
performance reasons. I suspect not, but please double check.
Sarah Sharp
On Sun, Mar 20, 2011 at 02:15:16AM -0700, Dmitry Torokhov wrote:
> Remove 'inline' markings from file-local functions and let compiler
> do its job and inline what makes sense for given architecture.
>
> Signed-off-by: Dmitry Torokhov <dtor@xxxxxxxxxx>
> ---
> drivers/usb/host/xhci-mem.c | 8 ++++----
> drivers/usb/host/xhci-ring.c | 8 ++++----
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
> index fcb41d9..0fc3a2d 100644
> --- a/drivers/usb/host/xhci-mem.c
> +++ b/drivers/usb/host/xhci-mem.c
> @@ -982,7 +982,7 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud
> * The NAK interval is one NAK per 1 to 255 microframes, or no NAKs if interval
> * is set to 0.
> */
> -static inline unsigned int xhci_get_endpoint_interval(struct usb_device *udev,
> +static unsigned int xhci_get_endpoint_interval(struct usb_device *udev,
> struct usb_host_endpoint *ep)
> {
> unsigned int interval = 0;
> @@ -1041,7 +1041,7 @@ static inline unsigned int xhci_get_endpoint_interval(struct usb_device *udev,
> * transaction opportunities per microframe", but that goes in the Max Burst
> * endpoint context field.
> */
> -static inline u32 xhci_get_endpoint_mult(struct usb_device *udev,
> +static u32 xhci_get_endpoint_mult(struct usb_device *udev,
> struct usb_host_endpoint *ep)
> {
> if (udev->speed != USB_SPEED_SUPER ||
> @@ -1050,7 +1050,7 @@ static inline u32 xhci_get_endpoint_mult(struct usb_device *udev,
> return ep->ss_ep_comp.bmAttributes;
> }
>
> -static inline u32 xhci_get_endpoint_type(struct usb_device *udev,
> +static u32 xhci_get_endpoint_type(struct usb_device *udev,
> struct usb_host_endpoint *ep)
> {
> int in;
> @@ -1084,7 +1084,7 @@ static inline u32 xhci_get_endpoint_type(struct usb_device *udev,
> * Basically, this is the maxpacket size, multiplied by the burst size
> * and mult size.
> */
> -static inline u32 xhci_get_max_esit_payload(struct xhci_hcd *xhci,
> +static u32 xhci_get_max_esit_payload(struct xhci_hcd *xhci,
> struct usb_device *udev,
> struct usb_host_endpoint *ep)
> {
> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
> index 7ec7acd..db919c6 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -93,7 +93,7 @@ dma_addr_t xhci_trb_virt_to_dma(struct xhci_segment *seg,
> /* Does this link TRB point to the first segment in a ring,
> * or was the previous TRB the last TRB on the last segment in the ERST?
> */
> -static inline bool last_trb_on_last_seg(struct xhci_hcd *xhci, struct xhci_ring *ring,
> +static bool last_trb_on_last_seg(struct xhci_hcd *xhci, struct xhci_ring *ring,
> struct xhci_segment *seg, union xhci_trb *trb)
> {
> if (ring == xhci->event_ring)
> @@ -107,7 +107,7 @@ static inline bool last_trb_on_last_seg(struct xhci_hcd *xhci, struct xhci_ring
> * segment? I.e. would the updated event TRB pointer step off the end of the
> * event seg?
> */
> -static inline int last_trb(struct xhci_hcd *xhci, struct xhci_ring *ring,
> +static int last_trb(struct xhci_hcd *xhci, struct xhci_ring *ring,
> struct xhci_segment *seg, union xhci_trb *trb)
> {
> if (ring == xhci->event_ring)
> @@ -116,7 +116,7 @@ static inline int last_trb(struct xhci_hcd *xhci, struct xhci_ring *ring,
> return (trb->link.control & TRB_TYPE_BITMASK) == TRB_TYPE(TRB_LINK);
> }
>
> -static inline int enqueue_is_link_trb(struct xhci_ring *ring)
> +static int enqueue_is_link_trb(struct xhci_ring *ring)
> {
> struct xhci_link_trb *link = &ring->enqueue->link;
> return ((link->control & TRB_TYPE_BITMASK) == TRB_TYPE(TRB_LINK));
> @@ -592,7 +592,7 @@ void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci,
> ep->ep_state |= SET_DEQ_PENDING;
> }
>
> -static inline void xhci_stop_watchdog_timer_in_irq(struct xhci_hcd *xhci,
> +static void xhci_stop_watchdog_timer_in_irq(struct xhci_hcd *xhci,
> struct xhci_virt_ep *ep)
> {
> ep->ep_state &= ~EP_HALT_PENDING;
> --
> 1.7.3.2
>
--
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
