Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755294Ab0KXNy6 (ORCPT ); Wed, 24 Nov 2010 08:54:58 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:58428 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755269Ab0KXNy4 (ORCPT ); Wed, 24 Nov 2010 08:54:56 -0500 Message-ID: <4CED1920.60904@pengutronix.de> Date: Wed, 24 Nov 2010 14:54:40 +0100 From: Marc Kleine-Budde Organization: Pengutronix User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.15) Gecko/20101027 Thunderbird/3.0.10 MIME-Version: 1.0 To: Tomoya MORINAGA CC: Wolfgang Grandegger , Wolfram Sang , Christian Pellegrin , Barry Song <21cnbao@gmail.com>, Samuel Ortiz , socketcan-core@lists.berlios.de, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , andrew.chih.howe.khor@intel.com, qi.wang@intel.com, margie.foster@intel.com, yong.y.wang@intel.com, kok.howg.ewe@intel.com, joel.clark@intel.com Subject: Re: [PATCH net-next-2.6 10/17 v3] can: EG20T PCH: Fix coding rule violation References: <4CED031E.7030403@dsn.okisemi.com> In-Reply-To: <4CED031E.7030403@dsn.okisemi.com> X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig852AA05FABA7749A1B5F875A" X-SA-Exim-Connect-IP: 2001:6f8:1178:4:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7275 Lines: 212 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig852AA05FABA7749A1B5F875A Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 11/24/2010 01:20 PM, Tomoya MORINAGA wrote: > Fix coding rule violation. >=20 > Signed-off-by: Tomoya MORINAGA Fix my comment (see online) , check if the lines stay (mostly) <=3D 80 chars and add my Acked-by. cheers, Marc > --- > drivers/net/can/pch_can.c | 48 > ++++++++++++++++++++------------------------ > 1 files changed, 22 insertions(+), 26 deletions(-) >=20 > diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c > index e71817d..318eb1f 100644 > --- a/drivers/net/can/pch_can.c > +++ b/drivers/net/can/pch_can.c > @@ -89,9 +89,11 @@ >=20 > #define PCH_CAN_CLK 50000000 /* 50MHz */ >=20 > -/* Define the number of message object. > +/* > + * Define the number of message object. > * PCH CAN communications are done via Message RAM. > - * The Message RAM consists of 32 message objects. */ > + * The Message RAM consists of 32 message objects. > + */ > #define PCH_RX_OBJ_NUM 26 > #define PCH_TX_OBJ_NUM 6 > #define PCH_RX_OBJ_START 1 > @@ -126,7 +128,7 @@ enum pch_can_mode { > PCH_CAN_ALL, > PCH_CAN_NONE, > PCH_CAN_STOP, > - PCH_CAN_RUN > + PCH_CAN_RUN, > }; >=20 > struct pch_can_if_regs { > @@ -290,21 +292,20 @@ static void pch_can_set_rxtx(struct pch_can_priv > *priv, u32 buff_num, > else > ie =3D PCH_IF_MCONT_RXIE; >=20 > - /* Reading the receive buffer data from RAM to Interface1 registers *= / > + /* Reading the receive buffer data from RAM to Interface1/2 registers= */ > iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[dir].cmask); > pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num); >=20 > - /* Setting the IF1MASK1 register to access MsgVal and RxIE bits */ > + /* Setting the IF1/2MASK1 register to access MsgVal and RxIE bits */ > iowrite32(PCH_CMASK_RDWR | PCH_CMASK_ARB | PCH_CMASK_CTRL, > &priv->regs->ifregs[dir].cmask); >=20 > if (set) { > - /* Setting the MsgVal and RxIE bits */ > + /* Setting the MsgVal and RxIE/TxIE bits */ > pch_can_bit_set(&priv->regs->ifregs[dir].mcont, ie); > pch_can_bit_set(&priv->regs->ifregs[dir].id2, PCH_ID_MSGVAL); > - > } else { > - /* Resetting the MsgVal and RxIE bits */ > + /* Clearing the MsgVal and RxIE/TxIE bits */ > pch_can_bit_clear(&priv->regs->ifregs[dir].mcont, ie); > pch_can_bit_clear(&priv->regs->ifregs[dir].id2, PCH_ID_MSGVAL); > } > @@ -312,7 +313,6 @@ static void pch_can_set_rxtx(struct pch_can_priv > *priv, u32 buff_num, > pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num); > } >=20 > - > static void pch_can_set_rx_all(struct pch_can_priv *priv, int set) > { > int i; > @@ -328,7 +328,7 @@ static void pch_can_set_tx_all(struct pch_can_priv > *priv, int set) >=20 > /* Traversing to obtain the object configured as transmit object. */ > for (i =3D PCH_TX_OBJ_START; i <=3D PCH_TX_OBJ_END; i++) > - pch_can_set_rxtx(priv, i, set, 1); > + pch_can_set_rxtx(priv, i, set, PCH_TX_IFREG); this should be folded into the patch 1 (along with the introduction of the enums) > } >=20 > static u32 pch_can_int_pending(struct pch_can_priv *priv) > @@ -363,8 +363,7 @@ static void pch_can_config_rx_tx_buffers(struct > pch_can_priv *priv) > int i; >=20 > for (i =3D PCH_RX_OBJ_START; i <=3D PCH_RX_OBJ_END; i++) { > - iowrite32(PCH_CMASK_RX_TX_GET, > - &priv->regs->ifregs[0].cmask); > + iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask); > pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i); >=20 > iowrite32(0x0, &priv->regs->ifregs[0].id1); > @@ -386,16 +385,14 @@ static void pch_can_config_rx_tx_buffers(struct > pch_can_priv *priv) > 0x1fff | PCH_MASK2_MDIR_MXTD); >=20 > /* Setting CMASK for writing */ > - iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK | > - PCH_CMASK_ARB | PCH_CMASK_CTRL, > - &priv->regs->ifregs[0].cmask); > + iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK | PCH_CMASK_ARB | > + PCH_CMASK_CTRL, &priv->regs->ifregs[0].cmask); >=20 > pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i); > } >=20 > for (i =3D PCH_TX_OBJ_START; i <=3D PCH_TX_OBJ_END; i++) { > - iowrite32(PCH_CMASK_RX_TX_GET, > - &priv->regs->ifregs[1].cmask); > + iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[1].cmask); > pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, i); >=20 > /* Resetting DIR bit for reception */ > @@ -410,9 +407,8 @@ static void pch_can_config_rx_tx_buffers(struct > pch_can_priv *priv) > pch_can_bit_clear(&priv->regs->ifregs[1].mask2, 0x1fff); >=20 > /* Setting CMASK for writing */ > - iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK | > - PCH_CMASK_ARB | PCH_CMASK_CTRL, > - &priv->regs->ifregs[1].cmask); > + iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK | PCH_CMASK_ARB | > + PCH_CMASK_CTRL, &priv->regs->ifregs[1].cmask); >=20 > pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, i); > } > @@ -471,8 +467,9 @@ static void pch_can_int_clr(struct pch_can_priv > *priv, u32 mask) >=20 > pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, mask); > } else if ((mask >=3D PCH_TX_OBJ_START) && (mask <=3D PCH_TX_OBJ_END)= ) { > - /* Setting CMASK for clearing interrupts for > - frame transmission. */ > + /* > + * Setting CMASK for clearing interrupts for frame transmission. > + */ > iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL | PCH_CMASK_ARB, > &priv->regs->ifregs[1].cmask); >=20 > @@ -600,7 +597,6 @@ static irqreturn_t pch_can_interrupt(int irq, void > *dev_id) > struct pch_can_priv *priv =3D netdev_priv(ndev); >=20 > pch_can_set_int_enables(priv, PCH_CAN_NONE); > - > napi_schedule(&priv->napi); >=20 > return IRQ_HANDLED; > @@ -1048,11 +1044,11 @@ static u32 pch_can_get_rxtx_ir(struct > pch_can_priv *priv, u32 buff_num, u32 dir) > pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num); >=20 > if (((ioread32(&priv->regs->ifregs[dir].id2)) & PCH_ID_MSGVAL) && > - ((ioread32(&priv->regs->ifregs[dir].mcont)) & ie)) { > + ((ioread32(&priv->regs->ifregs[dir].mcont)) & ie)) > enable =3D 1; > - } else { > + else > enable =3D 0; > - } > + > return enable; > } >=20 --=20 Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | --------------enig852AA05FABA7749A1B5F875A Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEUEARECAAYFAkztGSMACgkQjTAFq1RaXHPfCwCY4gdViZg6NokQeZDfdnet9MkR EQCfYOBfiF2jG00mVT8M/HAWeFmR+nA= =fpRn -----END PGP SIGNATURE----- --------------enig852AA05FABA7749A1B5F875A-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/