Re: [PATCH v3] add the driver for Analog Devices Blackfin on-chip CAN controllers

On Thu, Dec 10, 2009 at 6:21 PM, Wolfram Sang [off-list ref] wrote:

quoted

quoted

quoted

+     if (status) {
+             priv->can.can_stats.bus_error++;
+
+             cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
+
+             if (status & BEF)
+                     cf->data[2] |= CAN_ERR_PROT_BIT;
+             else if (status & FER)
+                     cf->data[2] |= CAN_ERR_PROT_FORM;
+             else if (status & SER)
+                     cf->data[2] |= CAN_ERR_PROT_STUFF;
+             else
+                     cf->data[2] |= CAN_ERR_PROT_UNSPEC;
+     }

Add {} here as well.

{} will cause checkpatch warning if it is given to only one line.

Right, no need for braces here, because it is always one statement after
if/else.

quoted

quoted

quoted

+     if ((irq == priv->tx_irq) && readw(&reg->mbtif2)) {
+             /* transmission complete interrupt */
+             writew(0xFFFF, &reg->mbtif2);
+             stats->tx_packets++;
+             stats->tx_bytes += bfin_can_read_dlc(priv, TRANSMIT_CHL);
+             can_get_echo_skb(dev, 0);
+             netif_wake_queue(dev);
+     } else if ((irq == priv->rx_irq) && readw(&reg->mbrif1)) {
+             /* receive interrupt */
+             isrc = readw(&reg->mbrif1);
+             writew(0xFFFF, &reg->mbrif1);
+             bfin_can_rx(dev, isrc);
+     } else if ((irq == priv->err_irq) && readw(&reg->gis)) {
+             /* error interrupt */
+             isrc = readw(&reg->gis);
+             status = readw(&reg->esr);
+             writew(0x7FF, &reg->gis);
+             bfin_can_err(dev, isrc, status);
+     } else
+             return IRQ_NONE;

Use {} here as well.

{} will cause checkpatch warning if it is given to only one line.

Then again, here braces are suggested. If the 'if'-block has braces, the
'else'-block should have braces, too. If checkpatch really complains about it,
this is a bug in checkpatch.

I think you are right. "else {return IRQ_NONE;}" gives no check patch warning.

Regards,

  Wolfram

--
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAksgy7kACgkQD27XaX1/VRuNlwCgsSRFNBn9ZOhqnQrNuO8T+jGD
0IcAnj31td4yugsGcccmKyPPkNTogzGt
=u741
-----END PGP SIGNATURE-----

_______________________________________________
Socketcan-core mailing list
Socketcan-core@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/socketcan-core