1 files changed, 5 insertions, 18 deletions

diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
index faa8404162b3..c56f1b1c11ca 100644
--- a/drivers/net/can/c_can/c_can.h
+++ b/drivers/net/can/c_can/c_can.h
@@ -22,14 +22,6 @@
 #ifndef C_CAN_H
 #define C_CAN_H
 
-/*
- * IFx register masks:
- * allow easy operation on 16-bit registers when the
- * argument is 32-bit instead
- */
-#define IFX_WRITE_LOW_16BIT(x)  ((x) & 0xFFFF)
-#define IFX_WRITE_HIGH_16BIT(x) (((x) & 0xFFFF0000) >> 16)
-
 /* message object split */
 #define C_CAN_NO_OF_OBJECTS     32
 #define C_CAN_MSG_OBJ_RX_NUM    16
@@ -45,8 +37,6 @@
 
 #define C_CAN_MSG_OBJ_RX_SPLIT  9
 #define C_CAN_MSG_RX_LOW_LAST   (C_CAN_MSG_OBJ_RX_SPLIT - 1)
-
-#define C_CAN_NEXT_MSG_OBJ_MASK (C_CAN_MSG_OBJ_TX_NUM - 1)
 #define RECEIVE_OBJECT_BITS     0x0000ffff
 
 enum reg {
@@ -183,23 +173,20 @@ struct c_can_priv {
         struct napi_struct napi;
         struct net_device *dev;
         struct device *device;
-        spinlock_t xmit_lock;
-        int tx_object;
-        int current_status;
+        atomic_t tx_active;
+        unsigned long tx_dir;
         int last_status;
         u16 (*read_reg) (struct c_can_priv *priv, enum reg index);
         void (*write_reg) (struct c_can_priv *priv, enum reg index, u16 val);
         void __iomem *base;
         const u16 *regs;
-        unsigned long irq_flags; /* for request_irq() */
-        unsigned int tx_next;
-        unsigned int tx_echo;
         void *priv;             /* for board-specific data */
-        u16 irqstatus;
         enum c_can_dev_id type;
         u32 __iomem *raminit_ctrlreg;
-        unsigned int instance;
+        int instance;
         void (*raminit) (const struct c_can_priv *priv, bool enable);
+        u32 comm_rcv_high;
+        u32 rxmasked;
         u32 dlc[C_CAN_MSG_OBJ_TX_NUM];
 };