lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: xhci - remove excessive 'inline' markings

Browse Source 
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@vmware.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
This commit is contained in:
Dmitry Torokhov
2011-03-20 02:15:16 -07:00
committed by Sarah Sharp
parent 22e0487047
commit 575688e1e5
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/host/xhci-mem.c
View File

@@ -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 * The NAK interval is one NAK per 1 to 255 microframes, or no NAKs if interval
* is set to 0. * 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) struct usb_host_endpoint *ep)
{ {
unsigned int interval = 0; 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 * transaction opportunities per microframe", but that goes in the Max Burst
* endpoint context field. * 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) struct usb_host_endpoint *ep)
{ {
if (udev->speed != USB_SPEED_SUPER || 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; 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) struct usb_host_endpoint *ep)
{ {
int in; 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 * Basically, this is the maxpacket size, multiplied by the burst size
* and mult 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_device *udev,
struct usb_host_endpoint *ep) struct usb_host_endpoint *ep)
{ {

8
drivers/usb/host/xhci-ring.c
View File

@@ -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, /* 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? * 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) struct xhci_segment *seg, union xhci_trb *trb)
{ {
if (ring == xhci->event_ring) 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 * segment? I.e. would the updated event TRB pointer step off the end of the
* event seg? * 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) struct xhci_segment *seg, union xhci_trb *trb)
{ {
if (ring == xhci->event_ring) 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); 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; struct xhci_link_trb *link = &ring->enqueue->link;
return ((link->control & TRB_TYPE_BITMASK) == TRB_TYPE(TRB_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; 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) struct xhci_virt_ep *ep)
{ {
ep->ep_state &= ~EP_HALT_PENDING; ep->ep_state &= ~EP_HALT_PENDING;