From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751939AbaH3Tz1 (ORCPT ); Sat, 30 Aug 2014 15:55:27 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:42563 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751802AbaH3Tz0 (ORCPT ); Sat, 30 Aug 2014 15:55:26 -0400 Date: Sat, 30 Aug 2014 22:54:32 +0300 From: Ramon Fried To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH] staging: netlogic: fixed checkpatch.pl styling warnings Message-ID: <20140830195432.GA29429@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="6TrnltStXW4iwmi0" Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --6TrnltStXW4iwmi0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline This patch fixes the following checkpatch.pl warnings: WARNING: Possible unnecessary 'out of memory' message #146: FILE: ./xlr_net.c:146: + if (!skb) { + pr_err("SKB allocation failed\n"); WARNING: Missing a blank line after declarations #1107: FILE: ./xlr_net.c:1107: + struct xlr_net_priv *priv = platform_get_drvdata(pdev); + unregister_netdev(priv->ndev); --6TrnltStXW4iwmi0 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-staging-netlogic-fixed-checkpatch.pl-styling-warning.patch" >>From 27b58d9b1d39ab99bf6022b82ac9e602621b2822 Mon Sep 17 00:00:00 2001 From: Ramon Fried Date: Sat, 30 Aug 2014 22:26:11 +0300 Subject: [PATCH] staging: netlogic: fixed checkpatch.pl styling warnings Signed-off-by: Ramon Fried --- drivers/staging/netlogic/xlr_net.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c index 9bf407d..28a42831 100644 --- a/drivers/staging/netlogic/xlr_net.c +++ b/drivers/staging/netlogic/xlr_net.c @@ -142,10 +142,8 @@ static inline struct sk_buff *xlr_alloc_skb(void) /* skb->data is cache aligned */ skb = alloc_skb(XLR_RX_BUF_SIZE, GFP_ATOMIC); - if (!skb) { - pr_err("SKB allocation failed\n"); + if (!skb) return NULL; - } mac_put_skb_back_ptr(skb); return skb; } @@ -1104,6 +1102,7 @@ err_gmac: static int xlr_net_remove(struct platform_device *pdev) { struct xlr_net_priv *priv = platform_get_drvdata(pdev); + unregister_netdev(priv->ndev); mdiobus_unregister(priv->mii_bus); mdiobus_free(priv->mii_bus); -- 1.9.1 --6TrnltStXW4iwmi0--