Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp7531111imu; Tue, 22 Jan 2019 07:29:18 -0800 (PST) X-Google-Smtp-Source: ALg8bN4JuyVwUrGEcKXSvYCWnT8RotJzr0w2jnMV4AbQxgsmGoxT4xer1Wi2Fz4tp5ZVwexQJuA7 X-Received: by 2002:a63:6906:: with SMTP id e6mr31807514pgc.144.1548170958196; Tue, 22 Jan 2019 07:29:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548170958; cv=none; d=google.com; s=arc-20160816; b=f5VY2NrzP0JuUdZhO4uRMs9WuOBODZO/ivjNsY5F+oFDB629+Vnu2T3Fzr3g7oZdK5 GZ+eauYs3UrVlkKCdKWCfs8gMUb2foYmEwFAnOB6RxUufTEWlp0QcJynZPyeQt8U9VdK ajT8tHbrUvV0rffTINIKesv0u5f1BbC4nsUntCQNNJOuvgz2+KHjVqlN+jIv7BnUqcVp u1+7J7/leMkc0pso/9ijl/ZJkayARbLznRK2eaRIcjXP41qsypx2OeOEnAwADv4gtC4D CPTAdNRA+IfelyKjkIKK/9y54q1hpRHXpMBR4JxBceN4WDIGpi6tYPXbZj1Ck/IyjZTo 0dXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=JJbqem84cQtktQrQWtPbPSH/RPVjdrQPMXup1L1Aw/I=; b=lEzHqtlHw6z3Scnc8DsHtg9/g0gyiRN9GRvqEE1Ez1Qbo9Z4oRKUmwgddzI5PM9peI rK0vgl6d/3As6BVbOkKGAeDJ0aNNCF56VNqxXu5eebMuXBs9xxI9kYvP3IkcxO8B6KAz byfIwk4xdydQJ2LZ7rOfikZtRA+sOGsh47w60fUpI2YoSud/D6ojR9JpBXNBD7zqR3zU 6XH0KnQRia+64A/7KwkzZqpbZS0kL/JYLxepbIph33irvlyGWwMD/UgMNWUnx76Lq+aG nu3mlUEL6bPTKRlAhbexd0DdturW3SZCMlaDuxwemJFhDSUs/9J+KjOLH9Z2qHmC4Ysk rpww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tPCRY7Ds; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 7si2776371pfb.226.2019.01.22.07.29.02; Tue, 22 Jan 2019 07:29:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tPCRY7Ds; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729371AbfAVPXF (ORCPT + 99 others); Tue, 22 Jan 2019 10:23:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:35530 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729771AbfAVPXC (ORCPT ); Tue, 22 Jan 2019 10:23:02 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D11B4217D4; Tue, 22 Jan 2019 15:23:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548170581; bh=8CaKk1YiZ5EpXj47z8uilPB4GkN41eABgNytxrs0mLg=; h=From:To:Cc:Subject:Date:From; b=tPCRY7Dsa0uzvQoFi7cJMRdtNOPoJqdkollAHUU8v8pynWeqr6gAcFA0VYdNrOg2k kDC+g2lok4t3BxnG7jSjauv/0CClRRZhDnxn3gXXwxO6ZeRHKLuJ/0ktK4x3kZR7Tn zsAK0UnfMzpVwjGuprpxWgkc5eV629padH3w4qRo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Kalle Valo , linux-wireless@vger.kernel.org, b43-dev@lists.infradead.org Subject: [PATCH] b43: no need to check return value of debugfs_create functions Date: Tue, 22 Jan 2019 16:21:29 +0100 Message-Id: <20190122152151.16139-30-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When calling debugfs functions, there is no need to ever check the return value. The function can work or not, but the code logic should never do something different based on this. Cc: Kalle Valo Cc: linux-wireless@vger.kernel.org Cc: b43-dev@lists.infradead.org Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/broadcom/b43/debugfs.c | 36 +++++---------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/drivers/net/wireless/broadcom/b43/debugfs.c b/drivers/net/wireless/broadcom/b43/debugfs.c index 77046384dd80..976c8ec4e992 100644 --- a/drivers/net/wireless/broadcom/b43/debugfs.c +++ b/drivers/net/wireless/broadcom/b43/debugfs.c @@ -668,15 +668,13 @@ static void b43_remove_dynamic_debug(struct b43_wldev *dev) static void b43_add_dynamic_debug(struct b43_wldev *dev) { struct b43_dfsentry *e = dev->dfsentry; - struct dentry *d; -#define add_dyn_dbg(name, id, initstate) do { \ - e->dyn_debug[id] = (initstate); \ - d = debugfs_create_bool(name, 0600, e->subdir, \ - &(e->dyn_debug[id])); \ - if (!IS_ERR(d)) \ - e->dyn_debug_dentries[id] = d; \ - } while (0) +#define add_dyn_dbg(name, id, initstate) do { \ + e->dyn_debug[id] = (initstate); \ + e->dyn_debug_dentries[id] = \ + debugfs_create_bool(name, 0600, e->subdir, \ + &(e->dyn_debug[id])); \ + } while (0) add_dyn_dbg("debug_xmitpower", B43_DBG_XMITPOWER, false); add_dyn_dbg("debug_dmaoverflow", B43_DBG_DMAOVERFLOW, false); @@ -718,19 +716,6 @@ void b43_debugfs_add_device(struct b43_wldev *dev) snprintf(devdir, sizeof(devdir), "%s", wiphy_name(dev->wl->hw->wiphy)); e->subdir = debugfs_create_dir(devdir, rootdir); - if (!e->subdir || IS_ERR(e->subdir)) { - if (e->subdir == ERR_PTR(-ENODEV)) { - b43dbg(dev->wl, "DebugFS (CONFIG_DEBUG_FS) not " - "enabled in kernel config\n"); - } else { - b43err(dev->wl, "debugfs: cannot create %s directory\n", - devdir); - } - dev->dfsentry = NULL; - kfree(log->log); - kfree(e); - return; - } e->mmio16read_next = 0xFFFF; /* invalid address */ e->mmio32read_next = 0xFFFF; /* invalid address */ @@ -741,13 +726,10 @@ void b43_debugfs_add_device(struct b43_wldev *dev) #define ADD_FILE(name, mode) \ do { \ - struct dentry *d; \ - d = debugfs_create_file(__stringify(name), \ + e->file_##name.dentry = \ + debugfs_create_file(__stringify(name), \ mode, e->subdir, dev, \ &fops_##name.fops); \ - e->file_##name.dentry = NULL; \ - if (!IS_ERR(d)) \ - e->file_##name.dentry = d; \ } while (0) @@ -818,8 +800,6 @@ void b43_debugfs_log_txstat(struct b43_wldev *dev, void b43_debugfs_init(void) { rootdir = debugfs_create_dir(KBUILD_MODNAME, NULL); - if (IS_ERR(rootdir)) - rootdir = NULL; } void b43_debugfs_exit(void) -- 2.20.1