From patchwork Wed Sep 24 08:54:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Einon X-Patchwork-Id: 392834 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 81225140095 for ; Wed, 24 Sep 2014 19:06:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753186AbaIXJF4 (ORCPT ); Wed, 24 Sep 2014 05:05:56 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:33788 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751601AbaIXIzy (ORCPT ); Wed, 24 Sep 2014 04:55:54 -0400 Received: by mail-wi0-f175.google.com with SMTP id r20so6446837wiv.14 for ; Wed, 24 Sep 2014 01:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=x4C3QqsTrbyAwM+Rg5F/HzdMR2TBrgSWqui/BTiVfZg=; b=MlBBfjsRmY1aVMJQLc5fA2vDwe8bHKGKLevvYqBuReOFbsvjqnw4GAT7ynT1klCxjF WU97UTRxU4ihpM7Dc7KEuYKQeozRGXoGEolcpi65zaC2y+yDscJtHqeBj9TmWoa4yAyN 1dns+USmCTETHziGEwelb6cFFKwvQtHpoYvx7amqSJYNNi/1VsMq3ENsqvK6PXj1QlLZ dz81TRTrZBWlGIpFmZ3uJIig5a3EX9/ppLomO9f71B4vNdqWKCOIH4PVIUTsPytxeg8z gaK4VtlWzJnDfeB/JF235h8887Zudsg1QZG9bYNutXf1M/6ZNUE404jFQrwIMM0Buexg Ni3Q== X-Received: by 10.180.74.212 with SMTP id w20mr9989181wiv.7.1411548952735; Wed, 24 Sep 2014 01:55:52 -0700 (PDT) Received: from leicester.auvation.com ([81.134.199.89]) by mx.google.com with ESMTPSA id q2sm4997439wiy.23.2014.09.24.01.55.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Sep 2014 01:55:52 -0700 (PDT) From: Mark Einon To: gregkh@linuxfoundation.org Cc: joe@perches.com, davem@davemloft.net, angus@agibson.me, tklauser@distanz.ch, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devel@driverdev.osuosl.org, Mark Einon Subject: [PATCH 2/4] staging: et131x: Cat some lines less than 80 columns Date: Wed, 24 Sep 2014 09:54:40 +0100 Message-Id: <1411548882-10639-2-git-send-email-mark.einon@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1411548882-10639-1-git-send-email-mark.einon@gmail.com> References: <1411506437.29268.13.camel@joe-AO725> <1411548882-10639-1-git-send-email-mark.einon@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Some split lines are less than 80 chars if rejoined, so rejoin them. Reported-by: Joe Perches Signed-off-by: Mark Einon --- drivers/staging/et131x/et131x.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index b976c75..f5459ec 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -3389,7 +3389,8 @@ static void et131x_adjust_link(struct net_device *netdev) et131x_mii_read(adapter, PHY_MPHY_CONTROL_REG, ®ister18); et131x_mii_write(adapter, phydev->addr, - PHY_MPHY_CONTROL_REG, register18 | 0x4); + PHY_MPHY_CONTROL_REG, + register18 | 0x4); et131x_mii_write(adapter, phydev->addr, PHY_INDEX_REG, register18 | 0x8402); et131x_mii_write(adapter, phydev->addr, PHY_DATA_REG, @@ -3422,7 +3423,8 @@ static void et131x_adjust_link(struct net_device *netdev) et131x_mii_read(adapter, PHY_MPHY_CONTROL_REG, ®ister18); et131x_mii_write(adapter, phydev->addr, - PHY_MPHY_CONTROL_REG, register18 | 0x4); + PHY_MPHY_CONTROL_REG, + register18 | 0x4); et131x_mii_write(adapter, phydev->addr, PHY_INDEX_REG, register18 | 0x8402); et131x_mii_write(adapter, phydev->addr, @@ -3746,8 +3748,7 @@ static irqreturn_t et131x_isr(int irq, void *dev_id) */ /* TRAP();*/ - dev_warn(&adapter->pdev->dev, - "RxDMA_ERR interrupt, error %x\n", + dev_warn(&adapter->pdev->dev, "RxDMA_ERR interrupt, error %x\n", readl(&iomem->txmac.tx_test)); } @@ -3773,8 +3774,7 @@ static irqreturn_t et131x_isr(int irq, void *dev_id) * occur. In a nutshell, the whole Tx path will have to be reset * and re-configured afterwards. */ - dev_warn(&adapter->pdev->dev, - "TXMAC interrupt, error 0x%08x\n", + dev_warn(&adapter->pdev->dev, "TXMAC interrupt, error 0x%08x\n", err); /* If we are debugging, we want to see this error, otherwise we