usb: isp1760: Prefix driver data structures with isp1760_

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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index 55c0add700b12405c65ca9a97b56eda67d757acd..99f56c6686e3878f0c0cc9b8782ef945adcd9da0 100644 (file)
--- 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 */
@@ -743,8 +743,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;
@@ -857,7 +858,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;
@@ -1097,7 +1098,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 7fc510f9bf6e7a6d70be89a49577dc98ca9bcfae..3056bcd8a393e36c70415af1656fae59e2c84f1f 100644 (file)
--- 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;
@@ -125,7 +125,7 @@ struct slotinfo {
 #define ISP1760_FLAG_INTR_EDGE_TRIG    0x00000100 /* Interrupt edge triggered */
 
 /* chip memory management */
-struct memory_chunk {
+struct isp1760_memory_chunk {
        unsigned int start;
        unsigned int size;
        unsigned int free;