From patchwork Tue Jul 25 07:00:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 793238 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WFBaCqgC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xGpzj6891z9s0g for ; Tue, 25 Jul 2017 17:00:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750780AbdGYHAr (ORCPT ); Tue, 25 Jul 2017 03:00:47 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34863 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750757AbdGYHAq (ORCPT ); Tue, 25 Jul 2017 03:00:46 -0400 Received: by mail-pf0-f193.google.com with SMTP id q85so12274294pfq.2 for ; Tue, 25 Jul 2017 00:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=cemCiHM4JplmrqjgezmHMsbOB93sFqJtd2mDjRYsM5U=; b=WFBaCqgC42tFAKipMGm28ufBIhd5CA1v9nMRCFBm+L4yr7pONFfepHy6ubDEHidyjL hTYb7QKl/LLKwTCq708AcjcZ7wMmrdHrHmqn2L8/o4K2CzG0ay8SXZnoPA/f+cJf5J13 lOP69dilJFUAGnvEVRSMbPyGPZ6/DYyzAfqaN8JPRi6rJuyOUKqzmhTLuoVp89wn+3ym c0Nk9A5MS7c9YpLWR0Gj08Llrxhl9w2tZJuW3Y5eiLUmlmPv1r+s1fgBGoY1jpJVxTij Xn7Vzgte4KDYadUw2eoZgimR8ftzeXT3NnhekPJ9BJb8Y8YCyvabwrklubWf9tl1bLAw +NBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=cemCiHM4JplmrqjgezmHMsbOB93sFqJtd2mDjRYsM5U=; b=lfB15O4HgEzkh4NONJq5JQz9EghdqYr6tKJWqDtYS2wCOrWHUFd8B/hwQTsBRZfHq2 hyAqwja02FWM+HOm9cFxkfxBLIr1vgJr8K+jWkK7lu+skgFuVWTenDKKH+lolGWJT6c7 CH/cBMXmpUqChU6p0YAtOK2HwzlhDYOjkS+v9PGVPdE+bVkGAcqMwqtiS2OBY/JGpqCp 2nrFMksKH1P9ZOhHAiI5pL4H819zfvB5UfWmf4jg6CtoYo20aKMcMfvLSmWQwLIPpZoH JxEj1eJ+wXY36qOjXfqckou9UfzhgSbxnZr6j0u4Yze1sPvZCh8Ns+v1BPNoeVZBGovK VO1w== X-Gm-Message-State: AIVw113MqVCzxjaXPMfOx9ITrIi14voR62SJ8w8yhgOwtyj1KFVYlwvO WZw2CWmCYByFAWRB2Ks= X-Received: by 10.99.122.94 with SMTP id j30mr18326461pgn.188.1500966045666; Tue, 25 Jul 2017 00:00:45 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([106.120.127.10]) by smtp.gmail.com with ESMTPSA id r73sm21935521pgr.32.2017.07.25.00.00.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 00:00:44 -0700 (PDT) From: Tonghao Zhang To: netdev@vger.kernel.org Cc: Tonghao Zhang Subject: [PATCH] drivers/net: Fix ptr_ret.cocci warnings. Date: Tue, 25 Jul 2017 00:00:26 -0700 Message-Id: <1500966026-88504-1-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org we can use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR 1. drivers/net/appletalk/ipddp.c 2. drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c Generated by: scripts/coccinelle/api/ptr_ret.cocci Signed-off-by: Tonghao Zhang --- drivers/net/appletalk/ipddp.c | 4 +--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c index a306de4..9375cef 100644 --- a/drivers/net/appletalk/ipddp.c +++ b/drivers/net/appletalk/ipddp.c @@ -311,9 +311,7 @@ static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) static int __init ipddp_init_module(void) { dev_ipddp = ipddp_init(); - if (IS_ERR(dev_ipddp)) - return PTR_ERR(dev_ipddp); - return 0; + return PTR_ERR_OR_ZERO(dev_ipddp); } static void __exit ipddp_cleanup_module(void) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c index 1447a83..2d3e5e2 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c @@ -78,10 +78,7 @@ int brcmf_debug_attach(struct brcmf_pub *drvr) return -ENODEV; drvr->dbgfs_dir = debugfs_create_dir(dev_name(dev), root_folder); - if (IS_ERR(drvr->dbgfs_dir)) - return PTR_ERR(drvr->dbgfs_dir); - - return 0; + return PTR_ERR_OR_ZERO(drvr->dbgfs_dir); } void brcmf_debug_detach(struct brcmf_pub *drvr)