Merge branch 'master' into can-usb1

[lincan.git] / lincan / include / can_queue.h

diff --git a/lincan/include/can_queue.h b/lincan/include/can_queue.h
index 5ed1fe41fc31f5ab30a62ef10810e7ee8828e7e7..42eeef4bae5c7f5d7862fed3d938a6d17caefaa4 100644 (file)
--- a/lincan/include/can_queue.h
+++ b/lincan/include/can_queue.h
@@ -273,7 +273,7 @@ int canque_fifo_init_slots(struct canque_fifo_t *fifo);
 
 /* Forward declarations for external types */
 struct msgobj_t;
-struct chip_t;
+struct canchip_t;
 
 /**
  * struct canque_edge_t - CAN message delivery subsystem graph edge
@@ -382,7 +382,7 @@ struct canque_ends_t {
            #endif /*CAN_WITH_RTL*/
                struct {
                        struct msgobj_t *msgobj;
-                       struct chip_t *chip;
+                       struct canchip_t *chip;
                    #ifndef CAN_WITH_RTL
                        wait_queue_head_t daemonq;
                    #else /*CAN_WITH_RTL*/
@@ -545,7 +545,7 @@ void canque_edge_do_dead(struct canque_edge_t *edge);
 
 /**
  * canque_edge_incref - increments edge reference count
- * @qedg: pointer to the edge structure
+ * @edge: pointer to the edge structure
  */
 static inline
 void canque_edge_incref(struct canque_edge_t *edge)
@@ -599,7 +599,7 @@ void __canque_edge_decref_body(struct canque_edge_t *edge)
 #ifndef CAN_HAVE_ARCH_CMPXCHG
 /**
  * canque_edge_decref - decrements edge reference count
- * @qedg: pointer to the edge structure
+ * @edge: pointer to the edge structure
  *
  * This function has to be called without lock held for both ends of edge.
  * If reference count drops to 0, function canque_edge_do_dead()