From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751119AbaHaASN (ORCPT ); Sat, 30 Aug 2014 20:18:13 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:43064 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750894AbaHaASM (ORCPT ); Sat, 30 Aug 2014 20:18:12 -0400 From: Ramon Fried To: ramon.fried@gmail.com Cc: Greg Kroah-Hartman , "David S. Miller" , Sarah Sharp , Daniel Borkmann , Alan Cox , Wilfried Klaebe , Mostyn Bramley-Moore , Toby Smith , Archana kumari , Jason Wang , Himangi Saraogi , Iulia Manda , devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] staging: netlogic: fixed checkpatch.pl styling warnings Date: Sun, 31 Aug 2014 03:16:48 +0300 Message-Id: <1409444211-758-1-git-send-email-ramon.fried@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); 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