diff options
author | Tomoya <tomoya-linux@dsn.okisemi.com> | 2010-12-12 15:24:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-13 15:24:23 -0500 |
commit | 9388b166a323f8f7e35eb7a0d17b297ca695fa91 (patch) | |
tree | fde4bd7bceef5e431b40960fecc91044cef1759b /drivers/net/can/pch_can.c | |
parent | 435b4efe93d4cec3aa0b36e8707df8d292d3641b (diff) |
pch_can: Fix coding rule violation
Fix coding rule violation.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/pch_can.c')
-rw-r--r-- | drivers/net/can/pch_can.c | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c index 0093a01fefd..da8d37bd02b 100644 --- a/drivers/net/can/pch_can.c +++ b/drivers/net/can/pch_can.c | |||
@@ -89,9 +89,11 @@ | |||
89 | 89 | ||
90 | #define PCH_CAN_CLK 50000000 /* 50MHz */ | 90 | #define PCH_CAN_CLK 50000000 /* 50MHz */ |
91 | 91 | ||
92 | /* Define the number of message object. | 92 | /* |
93 | * Define the number of message object. | ||
93 | * PCH CAN communications are done via Message RAM. | 94 | * PCH CAN communications are done via Message RAM. |
94 | * The Message RAM consists of 32 message objects. */ | 95 | * The Message RAM consists of 32 message objects. |
96 | */ | ||
95 | #define PCH_RX_OBJ_NUM 26 | 97 | #define PCH_RX_OBJ_NUM 26 |
96 | #define PCH_TX_OBJ_NUM 6 | 98 | #define PCH_TX_OBJ_NUM 6 |
97 | #define PCH_RX_OBJ_START 1 | 99 | #define PCH_RX_OBJ_START 1 |
@@ -126,7 +128,7 @@ enum pch_can_mode { | |||
126 | PCH_CAN_ALL, | 128 | PCH_CAN_ALL, |
127 | PCH_CAN_NONE, | 129 | PCH_CAN_NONE, |
128 | PCH_CAN_STOP, | 130 | PCH_CAN_STOP, |
129 | PCH_CAN_RUN | 131 | PCH_CAN_RUN, |
130 | }; | 132 | }; |
131 | 133 | ||
132 | struct pch_can_if_regs { | 134 | struct pch_can_if_regs { |
@@ -290,21 +292,20 @@ static void pch_can_set_rxtx(struct pch_can_priv *priv, u32 buff_num, | |||
290 | else | 292 | else |
291 | ie = PCH_IF_MCONT_RXIE; | 293 | ie = PCH_IF_MCONT_RXIE; |
292 | 294 | ||
293 | /* Reading the receive buffer data from RAM to Interface1 registers */ | 295 | /* Reading the receive buffer data from RAM to Interface1/2 registers */ |
294 | iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[dir].cmask); | 296 | iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[dir].cmask); |
295 | pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num); | 297 | pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num); |
296 | 298 | ||
297 | /* Setting the IF1MASK1 register to access MsgVal and RxIE bits */ | 299 | /* Setting the IF1/2MASK1 register to access MsgVal and RxIE bits */ |
298 | iowrite32(PCH_CMASK_RDWR | PCH_CMASK_ARB | PCH_CMASK_CTRL, | 300 | iowrite32(PCH_CMASK_RDWR | PCH_CMASK_ARB | PCH_CMASK_CTRL, |
299 | &priv->regs->ifregs[dir].cmask); | 301 | &priv->regs->ifregs[dir].cmask); |
300 | 302 | ||
301 | if (set) { | 303 | if (set) { |
302 | /* Setting the MsgVal and RxIE bits */ | 304 | /* Setting the MsgVal and RxIE/TxIE bits */ |
303 | pch_can_bit_set(&priv->regs->ifregs[dir].mcont, ie); | 305 | pch_can_bit_set(&priv->regs->ifregs[dir].mcont, ie); |
304 | pch_can_bit_set(&priv->regs->ifregs[dir].id2, PCH_ID_MSGVAL); | 306 | pch_can_bit_set(&priv->regs->ifregs[dir].id2, PCH_ID_MSGVAL); |
305 | |||
306 | } else { | 307 | } else { |
307 | /* Resetting the MsgVal and RxIE bits */ | 308 | /* Clearing the MsgVal and RxIE/TxIE bits */ |
308 | pch_can_bit_clear(&priv->regs->ifregs[dir].mcont, ie); | 309 | pch_can_bit_clear(&priv->regs->ifregs[dir].mcont, ie); |
309 | pch_can_bit_clear(&priv->regs->ifregs[dir].id2, PCH_ID_MSGVAL); | 310 | pch_can_bit_clear(&priv->regs->ifregs[dir].id2, PCH_ID_MSGVAL); |
310 | } | 311 | } |
@@ -362,8 +363,7 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv) | |||
362 | int i; | 363 | int i; |
363 | 364 | ||
364 | for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) { | 365 | for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) { |
365 | iowrite32(PCH_CMASK_RX_TX_GET, | 366 | iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask); |
366 | &priv->regs->ifregs[0].cmask); | ||
367 | pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i); | 367 | pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i); |
368 | 368 | ||
369 | iowrite32(0x0, &priv->regs->ifregs[0].id1); | 369 | iowrite32(0x0, &priv->regs->ifregs[0].id1); |
@@ -385,16 +385,14 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv) | |||
385 | 0x1fff | PCH_MASK2_MDIR_MXTD); | 385 | 0x1fff | PCH_MASK2_MDIR_MXTD); |
386 | 386 | ||
387 | /* Setting CMASK for writing */ | 387 | /* Setting CMASK for writing */ |
388 | iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK | | 388 | iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK | PCH_CMASK_ARB | |
389 | PCH_CMASK_ARB | PCH_CMASK_CTRL, | 389 | PCH_CMASK_CTRL, &priv->regs->ifregs[0].cmask); |
390 | &priv->regs->ifregs[0].cmask); | ||
391 | 390 | ||
392 | pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i); | 391 | pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i); |
393 | } | 392 | } |
394 | 393 | ||
395 | for (i = PCH_TX_OBJ_START; i <= PCH_TX_OBJ_END; i++) { | 394 | for (i = PCH_TX_OBJ_START; i <= PCH_TX_OBJ_END; i++) { |
396 | iowrite32(PCH_CMASK_RX_TX_GET, | 395 | iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[1].cmask); |
397 | &priv->regs->ifregs[1].cmask); | ||
398 | pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, i); | 396 | pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, i); |
399 | 397 | ||
400 | /* Resetting DIR bit for reception */ | 398 | /* Resetting DIR bit for reception */ |
@@ -409,9 +407,8 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv) | |||
409 | pch_can_bit_clear(&priv->regs->ifregs[1].mask2, 0x1fff); | 407 | pch_can_bit_clear(&priv->regs->ifregs[1].mask2, 0x1fff); |
410 | 408 | ||
411 | /* Setting CMASK for writing */ | 409 | /* Setting CMASK for writing */ |
412 | iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK | | 410 | iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK | PCH_CMASK_ARB | |
413 | PCH_CMASK_ARB | PCH_CMASK_CTRL, | 411 | PCH_CMASK_CTRL, &priv->regs->ifregs[1].cmask); |
414 | &priv->regs->ifregs[1].cmask); | ||
415 | 412 | ||
416 | pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, i); | 413 | pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, i); |
417 | } | 414 | } |
@@ -470,8 +467,9 @@ static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask) | |||
470 | 467 | ||
471 | pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, mask); | 468 | pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, mask); |
472 | } else if ((mask >= PCH_TX_OBJ_START) && (mask <= PCH_TX_OBJ_END)) { | 469 | } else if ((mask >= PCH_TX_OBJ_START) && (mask <= PCH_TX_OBJ_END)) { |
473 | /* Setting CMASK for clearing interrupts for | 470 | /* |
474 | frame transmission. */ | 471 | * Setting CMASK for clearing interrupts for frame transmission. |
472 | */ | ||
475 | iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL | PCH_CMASK_ARB, | 473 | iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL | PCH_CMASK_ARB, |
476 | &priv->regs->ifregs[1].cmask); | 474 | &priv->regs->ifregs[1].cmask); |
477 | 475 | ||
@@ -590,7 +588,6 @@ static irqreturn_t pch_can_interrupt(int irq, void *dev_id) | |||
590 | struct pch_can_priv *priv = netdev_priv(ndev); | 588 | struct pch_can_priv *priv = netdev_priv(ndev); |
591 | 589 | ||
592 | pch_can_set_int_enables(priv, PCH_CAN_NONE); | 590 | pch_can_set_int_enables(priv, PCH_CAN_NONE); |
593 | |||
594 | napi_schedule(&priv->napi); | 591 | napi_schedule(&priv->napi); |
595 | 592 | ||
596 | return IRQ_HANDLED; | 593 | return IRQ_HANDLED; |
@@ -1031,11 +1028,11 @@ static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num, | |||
1031 | pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num); | 1028 | pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num); |
1032 | 1029 | ||
1033 | if (((ioread32(&priv->regs->ifregs[dir].id2)) & PCH_ID_MSGVAL) && | 1030 | if (((ioread32(&priv->regs->ifregs[dir].id2)) & PCH_ID_MSGVAL) && |
1034 | ((ioread32(&priv->regs->ifregs[dir].mcont)) & ie)) { | 1031 | ((ioread32(&priv->regs->ifregs[dir].mcont)) & ie)) |
1035 | enable = 1; | 1032 | enable = 1; |
1036 | } else { | 1033 | else |
1037 | enable = 0; | 1034 | enable = 0; |
1038 | } | 1035 | |
1039 | return enable; | 1036 | return enable; |
1040 | } | 1037 | } |
1041 | 1038 | ||