On Mon, Oct 06, 2014 at 06:54:58PM +0300, Laurent Pinchart wrote: > The slotinfo and memory_chunk structures are specific to the driver and > defined in a header file. Prefix them with isp1760_ to avoid namespace > clashes. > > Signed-off-by: Laurent Pinchart <[email protected]>
Reviewed-by: Felipe Balbi <[email protected]> > --- > drivers/usb/host/isp1760-hcd.c | 15 ++++++++------- > drivers/usb/host/isp1760-hcd.h | 4 ++-- > 2 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c > index df715b6..5695ffc 100644 > --- a/drivers/usb/host/isp1760-hcd.c > +++ b/drivers/usb/host/isp1760-hcd.c > @@ -44,11 +44,11 @@ struct isp1760_hcd { > > u32 hcs_params; > spinlock_t lock; > - struct slotinfo atl_slots[32]; > + struct isp1760_slotinfo atl_slots[32]; > int atl_done_map; > - struct slotinfo int_slots[32]; > + struct isp1760_slotinfo int_slots[32]; > int int_done_map; > - struct memory_chunk memory_pool[BLOCKS]; > + struct isp1760_memory_chunk memory_pool[BLOCKS]; > struct list_head qh_list[QH_END]; > > /* periodic schedule support */ > @@ -748,8 +748,9 @@ static void qtd_free(struct isp1760_qtd *qtd) > } > > static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot, > - struct slotinfo *slots, struct isp1760_qtd *qtd, > - struct isp1760_qh *qh, struct ptd *ptd) > + struct isp1760_slotinfo *slots, > + struct isp1760_qtd *qtd, struct isp1760_qh *qh, > + struct ptd *ptd) > { > struct isp1760_hcd *priv = hcd_to_priv(hcd); > int skip_map; > @@ -862,7 +863,7 @@ static void enqueue_qtds(struct usb_hcd *hcd, struct > isp1760_qh *qh) > { > struct isp1760_hcd *priv = hcd_to_priv(hcd); > int ptd_offset; > - struct slotinfo *slots; > + struct isp1760_slotinfo *slots; > int curr_slot, free_slot; > int n; > struct ptd ptd; > @@ -1102,7 +1103,7 @@ static void handle_done_ptds(struct usb_hcd *hcd) > struct isp1760_qh *qh; > int slot; > int state; > - struct slotinfo *slots; > + struct isp1760_slotinfo *slots; > u32 ptd_offset; > struct isp1760_qtd *qtd; > int modified; > diff --git a/drivers/usb/host/isp1760-hcd.h b/drivers/usb/host/isp1760-hcd.h > index 9c55e93..2a918d6 100644 > --- a/drivers/usb/host/isp1760-hcd.h > +++ b/drivers/usb/host/isp1760-hcd.h > @@ -103,7 +103,7 @@ struct ptd { > #define ATL_PTD_OFFSET 0x0c00 > #define PAYLOAD_OFFSET 0x1000 > > -struct slotinfo { > +struct isp1760_slotinfo { > struct isp1760_qh *qh; > struct isp1760_qtd *qtd; > unsigned long timestamp; > @@ -126,7 +126,7 @@ struct slotinfo { > #define ISP1760_FLAG_RESET_ACTIVE_HIGH 0x80000000 /* RESET GPIO active > high */ > > /* chip memory management */ > -struct memory_chunk { > +struct isp1760_memory_chunk { > unsigned int start; > unsigned int size; > unsigned int free; > -- > 2.0.4 > -- balbi
signature.asc
Description: Digital signature
