From patchwork Wed Feb 12 15:55:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 319665 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 D4D482C00A5 for ; Thu, 13 Feb 2014 03:06:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753090AbaBLP5F (ORCPT ); Wed, 12 Feb 2014 10:57:05 -0500 Received: from mail-ea0-f169.google.com ([209.85.215.169]:51544 "EHLO mail-ea0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753084AbaBLP5C (ORCPT ); Wed, 12 Feb 2014 10:57:02 -0500 Received: by mail-ea0-f169.google.com with SMTP id h10so4571337eak.0 for ; Wed, 12 Feb 2014 07:57:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references:content-type; bh=1sFedNIUnluYyf/1gnZ9QQQDf0nBxugttNO11PktHA0=; b=m5J20F31M5qkvCQc6PwpBLIEjDrZtL6qsVuKRO3cPOrVKuNNwFlXOBJkKU51xa5O4g kClqeSMvITLmZUr78MAhFFqT7tTJ8PqxROO/8QFIlnhV6kFc8ZWwxvWJdTfBsRTrfNi6 cnpJAZGQHsnGaC8EqxIwhZNL0E/YsHLLrbIqNQnqg+TQq6wQ9FY3xOkq+b5w2iqB5VMK pZGqp0BfLFg28uJaT7fHwOAn+3uw9AgKjmQwTowLsVGMr043ZVLe1ZKnQ4+OojneI5Lh VPBkPVYJXROjSNOm7kS7GUivdnqt1qv0aOuXymLl7PcKKEf9wrFkpk70ThVE6hUS/pmb kMpA== X-Gm-Message-State: ALoCoQm20XaaOt33B5qUviRk1l227hMTt7gXMSved7bJtQ32Ybgoc6JoNaxAisDUm8xF+f23jnhs X-Received: by 10.15.99.201 with SMTP id bl49mr4815569eeb.53.1392220621085; Wed, 12 Feb 2014 07:57:01 -0800 (PST) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id m9sm82057382eeh.3.2014.02.12.07.56.58 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Wed, 12 Feb 2014 07:56:59 -0800 (PST) From: Michal Simek To: netdev@vger.kernel.org Cc: Srikanth Thokala , Srikanth Thokala , Michal Simek , Anirudha Sarangi , John Linn , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/14] net: axienet: Removed checkpatch errors/warnings Date: Wed, 12 Feb 2014 16:55:42 +0100 Message-Id: <75b669c0a947effe74b291093abfa8c71f83736a.1392220536.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Srikanth Thokala Removed checkpatch.pl errors and warnings. Signed-off-by: Srikanth Thokala Signed-off-by: Michal Simek --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 20 ++++++++++---------- drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 21 +++++++++++---------- 2 files changed, 21 insertions(+), 20 deletions(-) -- 1.8.2.3 diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index 9cc9e59..6059a0f 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -444,8 +444,8 @@ static void __axienet_device_reset(struct axienet_local *lp, while (axienet_dma_in32(lp, offset) & XAXIDMA_CR_RESET_MASK) { udelay(1); if (--timeout == 0) { - dev_err(dev, "axienet_device_reset DMA " - "reset timeout!\n"); + netdev_err(lp->ndev, + "axienet_device_reset DMA reset timeout!\n"); break; } } @@ -484,8 +484,8 @@ static void axienet_device_reset(struct net_device *ndev) } if (axienet_dma_bd_init(ndev)) { - dev_err(&ndev->dev, "axienet_device_reset descriptor " - "allocation failed\n"); + netdev_err(ndev, + "axienet_device_reset descriptor allocation failed\n"); } axienet_status = axienet_ior(lp, XAE_RCW1_OFFSET); @@ -560,8 +560,8 @@ static void axienet_adjust_link(struct net_device *ndev) lp->last_link = link_state; phy_print_status(phy); } else { - dev_err(&ndev->dev, "Error setting Axi Ethernet " - "mac speed\n"); + netdev_err(ndev, + "Error setting Axi Ethernet mac speed\n"); } } } @@ -1238,8 +1238,8 @@ axienet_ethtools_set_pauseparam(struct net_device *ndev, struct axienet_local *lp = netdev_priv(ndev); if (netif_running(ndev)) { - printk(KERN_ERR "%s: Please stop netif before applying " - "configruation\n", ndev->name); + netdev_err(ndev, + "Please stop netif before applying configuration\n"); return -EFAULT; } @@ -1295,8 +1295,8 @@ static int axienet_ethtools_set_coalesce(struct net_device *ndev, struct axienet_local *lp = netdev_priv(ndev); if (netif_running(ndev)) { - printk(KERN_ERR "%s: Please stop netif before applying " - "configruation\n", ndev->name); + netdev_err(ndev, + "Please stop netif before applying configuration\n"); return -EFAULT; } diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c index 64b4639..ef0a20c 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c @@ -161,19 +161,19 @@ int axienet_mdio_setup(struct axienet_local *lp, struct device_node *np) np1 = of_find_node_by_name(NULL, "cpu"); if (!np1) { - printk(KERN_WARNING "%s(): Could not find CPU device node.", - __func__); - printk(KERN_WARNING "Setting MDIO clock divisor to " - "default %d\n", DEFAULT_CLOCK_DIVISOR); + netdev_warn(lp->ndev, "Could not find CPU device node."); + netdev_warn(lp->ndev, + "Setting MDIO clock divisor to default %d\n", + DEFAULT_CLOCK_DIVISOR); clk_div = DEFAULT_CLOCK_DIVISOR; goto issue; } property_p = (u32 *) of_get_property(np1, "clock-frequency", NULL); if (!property_p) { - printk(KERN_WARNING "%s(): Could not find CPU property: " - "clock-frequency.", __func__); - printk(KERN_WARNING "Setting MDIO clock divisor to " - "default %d\n", DEFAULT_CLOCK_DIVISOR); + netdev_warn(lp->ndev, + "Could not find clock ethernet controller property."); + netdev_warn(lp->ndev, "Setting MDIO clock divisor to default %d\n", + DEFAULT_CLOCK_DIVISOR); clk_div = DEFAULT_CLOCK_DIVISOR; of_node_put(np1); goto issue; @@ -187,8 +187,9 @@ int axienet_mdio_setup(struct axienet_local *lp, struct device_node *np) if (host_clock % (MAX_MDIO_FREQ * 2)) clk_div++; - printk(KERN_DEBUG "%s(): Setting MDIO clock divisor to %u based " - "on %u Hz host clock.\n", __func__, clk_div, host_clock); + netdev_dbg(lp->ndev, + "Setting MDIO clock divisor to %u based on %u Hz host clock.\n", + clk_div, host_clock); of_node_put(np1); issue: