From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH 1/6] net/macb: configure for FIFO mode and non-gigabit Date: Sun, 20 Jul 2014 21:12:32 -0700 (PDT) Message-ID: <20140720.211232.1172882419541843442.davem@davemloft.net> References: <34adf38d52eb31e3ffd36149d320eb0872452bb1.1405689937.git.cyrille.pitchen@atmel.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: nicolas.ferre@atmel.com, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, soren.brinkmann@xilinx.com, linux-kernel@vger.kernel.org To: cyrille.pitchen@atmel.com Return-path: In-Reply-To: <34adf38d52eb31e3ffd36149d320eb0872452bb1.1405689937.git.cyrille.pitchen@atmel.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Cyrille Pitchen Date: Fri, 18 Jul 2014 16:21:13 +0200 > From: Nicolas Ferre > > This addition will also allow to configure DMA burst length. > > Signed-off-by: Nicolas Ferre > Acked-by: Cyrille Pitchen > --- > drivers/net/ethernet/cadence/macb.c | 72 +++++++++++++++++++++++++++---------- > drivers/net/ethernet/cadence/macb.h | 19 ++++++++-- > 2 files changed, 71 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c > index e9daa07..0896d88 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -264,7 +264,8 @@ static void macb_handle_link_change(struct net_device *dev) > reg |= MACB_BIT(FD); > if (phydev->speed == SPEED_100) > reg |= MACB_BIT(SPD); > - if (phydev->speed == SPEED_1000) > + if (phydev->speed == SPEED_1000 > + && bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE) Conditional operators end lines, they do not begin lines. Also you must start the second and subsequent lines at the very first column after the openning parenthesis of the first line.