Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp7528315imu; Tue, 22 Jan 2019 07:26:43 -0800 (PST) X-Google-Smtp-Source: ALg8bN6e1pQ8TsP0AfUysQGR0k+xXBfxxvax/0WYQG7H65r4YiI2QQ+hJt98iZ+poZzsHwKy9Y2x X-Received: by 2002:a17:902:b592:: with SMTP id a18mr34690021pls.293.1548170803811; Tue, 22 Jan 2019 07:26:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548170803; cv=none; d=google.com; s=arc-20160816; b=etd3LPdtCSf+x429VQR+KvUCkhhrg5zPvCDTMhYMnCLbtbDksbV2ZNKVfh3uQgkY1D qXGOBGJMTB7k1dIauod9cAbJbYmeqgwZtJUirleeWZ4khvQHG6U3TdKOAHNHq5GyM7eq k8i3fkJs1efCxkzKDWspA6exqhGXLWI+d36LT4pI3sVfZEZpwKNdifxL0e03yYZxczWf 3pSEZ/MuvkkVz2/CLaPwQGHYgWKby38Zd5G+f04TtqhxN7SEped2vjFUZfR/YMIMDXvZ RBbx5RMupqoPAh1bjB3AgMPN13m0Ke4RY2nenC3v019PWSpfMPfJ2KLZ2SuuzG+EClL/ oMOA== 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=3NkEictIfiDvSBqyjIWWRvQeGYWbguj9JCfI4S9Q1DE=; b=IbLkCad1kZC9Q4jB5XjGztmwkWpk60ne/rg22qUl7583c/aoHv8cTjZd/olIDlcLh2 xsYLBvOr1UO56uwqWML5L3iJzwUH43XnvLqZr8o71W3pm6fR8bxxnICw0KDYVQauc0X/ dUCCFitEr/1OX8YiX5+iWGQ9JpoP2eRjXRlaROvjHgvnxMEEYD2K4NHHylRVxpcNV0i5 dEvX0j8Pajjo3boqpfq2pyuGH1DfmkdRndHKz1bAAcZNuTpYGSEFNNlFYrLNA5VmAshc wqWrlm6QsbTBRbD3HlTnC4r5q2uOugYSaneKZvMANU9tK4JZMlIfOVg8vO7ZI36ZB7j1 BGsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VYdVPf6s; 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 w8si6347572pgm.467.2019.01.22.07.26.28; Tue, 22 Jan 2019 07:26:43 -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=VYdVPf6s; 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 S1730139AbfAVPY3 (ORCPT + 99 others); Tue, 22 Jan 2019 10:24:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:38152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729476AbfAVPY1 (ORCPT ); Tue, 22 Jan 2019 10:24:27 -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 706E3217D6; Tue, 22 Jan 2019 15:24:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548170665; bh=D5zPW7w5hU6nCIZyErADRirT5vqubHja16L1TmqXObw=; h=From:To:Cc:Subject:Date:From; b=VYdVPf6s6E2boW+5GziFV74dxU8FUtJrZOZD5USxBtiZkS5nVzMMYZfLuSMS9yuml yYpy8+6sI7SCygeNcYUi0+Voq4ZvxYx7pvZgQLjnVoW1QkJry+Cl/5D4oWgYDV4+bG Oe++IAxRParu54HJZIPsVFRC1DAd3iZJADsvXgj4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Arend van Spriel , Franky Lin , Hante Meuleman , Chi-Hsien Lin , Wright Feng , Kalle Valo , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com Subject: [PATCH] brcm80211: no need to check return value of debugfs_create functions Date: Tue, 22 Jan 2019 16:21:31 +0100 Message-Id: <20190122152151.16139-32-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: Arend van Spriel Cc: Franky Lin Cc: Hante Meuleman Cc: Chi-Hsien Lin Cc: Wright Feng Cc: Kalle Valo Cc: linux-wireless@vger.kernel.org Cc: brcm80211-dev-list.pdl@broadcom.com Cc: brcm80211-dev-list@cypress.com Signed-off-by: Greg Kroah-Hartman --- .../broadcom/brcm80211/brcmsmac/debug.c | 26 +++---------------- .../broadcom/brcm80211/brcmsmac/debug.h | 2 +- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c index 3bd54f125776..6d776ef6ff54 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c @@ -37,27 +37,18 @@ static struct dentry *root_folder; void brcms_debugfs_init(void) { root_folder = debugfs_create_dir(KBUILD_MODNAME, NULL); - if (IS_ERR(root_folder)) - root_folder = NULL; } void brcms_debugfs_exit(void) { - if (!root_folder) - return; - debugfs_remove_recursive(root_folder); root_folder = NULL; } -int brcms_debugfs_attach(struct brcms_pub *drvr) +void brcms_debugfs_attach(struct brcms_pub *drvr) { - if (!root_folder) - return -ENODEV; - drvr->dbgfs_dir = debugfs_create_dir( dev_name(&drvr->wlc->hw->d11core->dev), root_folder); - return PTR_ERR_OR_ZERO(drvr->dbgfs_dir); } void brcms_debugfs_detach(struct brcms_pub *drvr) @@ -195,7 +186,7 @@ static const struct file_operations brcms_debugfs_def_ops = { .llseek = seq_lseek }; -static int +static void brcms_debugfs_add_entry(struct brcms_pub *drvr, const char *fn, int (*read_fn)(struct seq_file *seq, void *data)) { @@ -203,27 +194,18 @@ brcms_debugfs_add_entry(struct brcms_pub *drvr, const char *fn, struct dentry *dentry = drvr->dbgfs_dir; struct brcms_debugfs_entry *entry; - if (IS_ERR_OR_NULL(dentry)) - return -ENOENT; - entry = devm_kzalloc(dev, sizeof(*entry), GFP_KERNEL); if (!entry) - return -ENOMEM; + return; entry->read = read_fn; entry->drvr = drvr; - dentry = debugfs_create_file(fn, 0444, dentry, entry, - &brcms_debugfs_def_ops); - - return PTR_ERR_OR_ZERO(dentry); + debugfs_create_file(fn, 0444, dentry, entry, &brcms_debugfs_def_ops); } void brcms_debugfs_create_files(struct brcms_pub *drvr) { - if (IS_ERR_OR_NULL(drvr->dbgfs_dir)) - return; - brcms_debugfs_add_entry(drvr, "hardware", brcms_debugfs_hardware_read); brcms_debugfs_add_entry(drvr, "macstat", brcms_debugfs_macstat_read); } diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h index 822781cf15d4..56898e6d789d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h @@ -68,7 +68,7 @@ void __brcms_dbg(struct device *dev, u32 level, const char *func, struct brcms_pub; void brcms_debugfs_init(void); void brcms_debugfs_exit(void); -int brcms_debugfs_attach(struct brcms_pub *drvr); +void brcms_debugfs_attach(struct brcms_pub *drvr); void brcms_debugfs_detach(struct brcms_pub *drvr); struct dentry *brcms_debugfs_get_devdir(struct brcms_pub *drvr); void brcms_debugfs_create_files(struct brcms_pub *drvr); -- 2.20.1