From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 297B9C282C3 for ; Tue, 22 Jan 2019 15:24:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDE87217D8 for ; Tue, 22 Jan 2019 15:24:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548170670; bh=e2y59XZb7DFILz6Evilia49Qg0E7GOlMqA2nKZxAmd0=; h=From:To:Cc:Subject:Date:List-ID:From; b=0jlkQzG/bFo6sHlLIqcO8vDv7xeaaS9/OBCXQEg+abX86xwpxE4R1k9L6MgLOxuQA gI6uZdAih8X+gpj/2d2wApE3LIJcW4x9+AWBhE0AwXnaL0Vmc6Od+OeCmlw783DOTJ dZpzPqRZZOuBFF5p14RRiT1EBHR0HvXmr+Is2/Pg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730120AbfAVPYX (ORCPT ); Tue, 22 Jan 2019 10:24:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:37988 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729372AbfAVPYT (ORCPT ); Tue, 22 Jan 2019 10:24:19 -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 0BD9620855; Tue, 22 Jan 2019 15:24:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548170657; bh=e2y59XZb7DFILz6Evilia49Qg0E7GOlMqA2nKZxAmd0=; h=From:To:Cc:Subject:Date:From; b=OOKJtedLt9ol2OZqTsh5wG8ALmeOgH5C8s91ASEVcDKdLKZnc+mVX4y2rcZzd0M4k TzkJXG9zuQrV/Ecj2MngA21rmA2RMwsdm6NAHj/FsrbLWrjDgIV3O9SByAyssdnH9m EhTKFeV9rhsIEOG6mKJSS+E9liKoLG7Ci/CWVS8s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Christoph Hellwig , Marek Szyprowski , Robin Murphy , iommu@lists.linux-foundation.org Subject: [PATCH] dma: debug: no need to check return value of debugfs_create functions Date: Tue, 22 Jan 2019 16:21:38 +0100 Message-Id: <20190122152151.16139-39-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. Also delete the variables for the file dentries for the debugfs entries as they are never used at all once they are created. Cc: Christoph Hellwig Cc: Marek Szyprowski Cc: Robin Murphy Cc: iommu@lists.linux-foundation.org Signed-off-by: Greg Kroah-Hartman --- kernel/dma/debug.c | 81 ++++++---------------------------------------- 1 file changed, 10 insertions(+), 71 deletions(-) diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index 23cf5361bcf1..2f5fc8b9d39f 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -136,14 +136,6 @@ static u32 nr_prealloc_entries = PREALLOC_DMA_DEBUG_ENTRIES; /* debugfs dentry's for the stuff above */ static struct dentry *dma_debug_dent __read_mostly; -static struct dentry *global_disable_dent __read_mostly; -static struct dentry *error_count_dent __read_mostly; -static struct dentry *show_all_errors_dent __read_mostly; -static struct dentry *show_num_errors_dent __read_mostly; -static struct dentry *num_free_entries_dent __read_mostly; -static struct dentry *min_free_entries_dent __read_mostly; -static struct dentry *nr_total_entries_dent __read_mostly; -static struct dentry *filter_dent __read_mostly; /* per-driver filter related state */ @@ -840,66 +832,18 @@ static const struct file_operations filter_fops = { .llseek = default_llseek, }; -static int dma_debug_fs_init(void) +static void dma_debug_fs_init(void) { dma_debug_dent = debugfs_create_dir("dma-api", NULL); - if (!dma_debug_dent) { - pr_err("can not create debugfs directory\n"); - return -ENOMEM; - } - - global_disable_dent = debugfs_create_bool("disabled", 0444, - dma_debug_dent, - &global_disable); - if (!global_disable_dent) - goto out_err; - - error_count_dent = debugfs_create_u32("error_count", 0444, - dma_debug_dent, &error_count); - if (!error_count_dent) - goto out_err; - - show_all_errors_dent = debugfs_create_u32("all_errors", 0644, - dma_debug_dent, - &show_all_errors); - if (!show_all_errors_dent) - goto out_err; - - show_num_errors_dent = debugfs_create_u32("num_errors", 0644, - dma_debug_dent, - &show_num_errors); - if (!show_num_errors_dent) - goto out_err; - - num_free_entries_dent = debugfs_create_u32("num_free_entries", 0444, - dma_debug_dent, - &num_free_entries); - if (!num_free_entries_dent) - goto out_err; - - min_free_entries_dent = debugfs_create_u32("min_free_entries", 0444, - dma_debug_dent, - &min_free_entries); - if (!min_free_entries_dent) - goto out_err; - - nr_total_entries_dent = debugfs_create_u32("nr_total_entries", 0444, - dma_debug_dent, - &nr_total_entries); - if (!nr_total_entries_dent) - goto out_err; - - filter_dent = debugfs_create_file("driver_filter", 0644, - dma_debug_dent, NULL, &filter_fops); - if (!filter_dent) - goto out_err; - - return 0; -out_err: - debugfs_remove_recursive(dma_debug_dent); - - return -ENOMEM; + debugfs_create_bool("disabled", 0444, dma_debug_dent, &global_disable); + debugfs_create_u32("error_count", 0444, dma_debug_dent, &error_count); + debugfs_create_u32("all_errors", 0644, dma_debug_dent, &show_all_errors); + debugfs_create_u32("num_errors", 0644, dma_debug_dent, &show_num_errors); + debugfs_create_u32("num_free_entries", 0444, dma_debug_dent, &num_free_entries); + debugfs_create_u32("min_free_entries", 0444, dma_debug_dent, &min_free_entries); + debugfs_create_u32("nr_total_entries", 0444, dma_debug_dent, &nr_total_entries); + debugfs_create_file("driver_filter", 0644, dma_debug_dent, NULL, &filter_fops); } static int device_dma_allocations(struct device *dev, struct dma_debug_entry **out_entry) @@ -985,12 +929,7 @@ static int dma_debug_init(void) spin_lock_init(&dma_entry_hash[i].lock); } - if (dma_debug_fs_init() != 0) { - pr_err("error creating debugfs entries - disabling\n"); - global_disable = true; - - return 0; - } + dma_debug_fs_init(); nr_pages = DIV_ROUND_UP(nr_prealloc_entries, DMA_DEBUG_DYNAMIC_ENTRIES); for (i = 0; i < nr_pages; ++i) -- 2.20.1