From patchwork Tue May 29 14:29:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10435669 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2F13760327 for ; Tue, 29 May 2018 14:32:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E7EB28606 for ; Tue, 29 May 2018 14:32:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12EF328628; Tue, 29 May 2018 14:32:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1CAB128606 for ; Tue, 29 May 2018 14:31:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=TUerrKCgAR3e8Nb4u9vcEt4pUkCvhxQyHGvwqcG0ib8=; b=pB5jIK2v1kU6y5wVHk5L3FPcZO J35OQBK+3ElVr6030wx0xljtVq7suv7S0ORR620ePq8ERY3jyEVTYiq3sI7OUxwi+A5rtkY0sunb7 cMJkCu5GLB5BXLk9rr1RXOUq/ORkImyDogTy/LFvsx+K0RHO2WZqg5o7roNes42OFiWu11+3ElZMD 3zRexjM6cQPm122fQaldUN04+zBrd1iqDHZzt7mR6UGdvGiQ8wJZNkFsOdCACr4GOsv2xarP+QCbz syOTTnQQZjjFXHFNtE++xqUEtIguECpMuDzE7Ko0NR7/hJC5OV/JbyBvHExFngRcPloON1LvC2HNN 6K3SFjUw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNff9-0002nV-B3; Tue, 29 May 2018 14:31:47 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNfeQ-0002S8-3n; Tue, 29 May 2018 14:31:40 +0000 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (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 D5A92208A0; Tue, 29 May 2018 14:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527604251; bh=h3PmsUFkNqARSUZm6chwkPoN4SrQEjtFuZ6luRSWYLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HGzgxeDrfDJIYep0ZTGjPxpzmvmdLsLhZYLtQVC6YBvL+nV8W0+cj5u+p4hDps23H f1bLb4g1fVLuPj/e/Lhw+zwV3V8nvrAjnUbQH20JYYFxHrFl5Gn7OEZ0gyn44Jrou5 oNft+hmiNQyNg7CEo7Rgbt4HAP8uzLjFWBdviY2U= From: Greg Kroah-Hartman To: devel@driverdev.osuosl.org Subject: [PATCH 04/13] staging: vc04_services: no need to check debugfs return values Date: Tue, 29 May 2018 16:29:38 +0200 Message-Id: <20180529142947.3250-4-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180529142947.3250-1-gregkh@linuxfoundation.org> References: <20180529142947.3250-1-gregkh@linuxfoundation.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180529_073102_197046_840CCFC7 X-CRM114-Status: GOOD ( 19.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Wahren , Kees Cook , Arnd Bergmann , Greg Kroah-Hartman , Keerthi Reddy , Eric Anholt , linux-rpi-kernel@lists.infradead.org, Dan Carpenter , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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. Clean up the vchiq_arm code by not caring about the value of debugfs calls. This ends up removing a number of lines of code that are not needed. Cc: Eric Anholt Cc: Stefan Wahren Cc: Kees Cook Cc: Dan Carpenter Cc: Arnd Bergmann Cc: Keerthi Reddy Cc: linux-rpi-kernel@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Greg Kroah-Hartman Reviewed-by: Eric Anholt --- .../interface/vchiq_arm/vchiq_arm.c | 13 +--- .../interface/vchiq_arm/vchiq_debugfs.c | 72 +++---------------- .../interface/vchiq_arm/vchiq_debugfs.h | 4 +- 3 files changed, 15 insertions(+), 74 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index aaa264f3b598..bc05c69383b8 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -2018,7 +2018,6 @@ vchiq_open(struct inode *inode, struct file *file) vchiq_log_info(vchiq_arm_log_level, "vchiq_open"); switch (dev) { case VCHIQ_MINOR: { - int ret; VCHIQ_STATE_T *state = vchiq_get_state(); VCHIQ_INSTANCE_T instance; @@ -2035,11 +2034,7 @@ vchiq_open(struct inode *inode, struct file *file) instance->state = state; instance->pid = current->tgid; - ret = vchiq_debugfs_add_instance(instance); - if (ret != 0) { - kfree(instance); - return ret; - } + vchiq_debugfs_add_instance(instance); sema_init(&instance->insert_event, 0); sema_init(&instance->remove_event, 0); @@ -3630,9 +3625,7 @@ static int vchiq_probe(struct platform_device *pdev) goto failed_device_create; /* create debugfs entries */ - err = vchiq_debugfs_init(); - if (err != 0) - goto failed_debugfs_init; + vchiq_debugfs_init(); vchiq_log_info(vchiq_arm_log_level, "vchiq: initialised - version %d (min %d), device %d.%d", @@ -3645,8 +3638,6 @@ static int vchiq_probe(struct platform_device *pdev) return 0; -failed_debugfs_init: - device_destroy(vchiq_class, vchiq_devid); failed_device_create: class_destroy(vchiq_class); failed_class_create: diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c index 766b4fe5f32c..103fec955e2c 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c @@ -158,15 +158,12 @@ static const struct file_operations debugfs_log_fops = { }; /* create an entry under /vchiq/log for each log category */ -static int vchiq_debugfs_create_log_entries(struct dentry *top) +static void vchiq_debugfs_create_log_entries(struct dentry *top) { struct dentry *dir; size_t i; - int ret = 0; dir = debugfs_create_dir("log", vchiq_debugfs_top()); - if (!dir) - return -ENOMEM; debugfs_info.log_categories = dir; for (i = 0; i < n_log_entries; i++) { @@ -177,14 +174,8 @@ static int vchiq_debugfs_create_log_entries(struct dentry *top) debugfs_info.log_categories, levp, &debugfs_log_fops); - if (!dir) { - ret = -ENOMEM; - break; - } - vchiq_debugfs_log_entries[i].dir = dir; } - return ret; } static int debugfs_usecount_show(struct seq_file *f, void *offset) @@ -268,43 +259,22 @@ static const struct file_operations debugfs_trace_fops = { }; /* add an instance (process) to the debugfs entries */ -int vchiq_debugfs_add_instance(VCHIQ_INSTANCE_T instance) +void vchiq_debugfs_add_instance(VCHIQ_INSTANCE_T instance) { char pidstr[16]; - struct dentry *top, *use_count, *trace; + struct dentry *top; struct dentry *clients = vchiq_clients_top(); snprintf(pidstr, sizeof(pidstr), "%d", vchiq_instance_get_pid(instance)); top = debugfs_create_dir(pidstr, clients); - if (!top) - goto fail_top; - - use_count = debugfs_create_file("use_count", - 0444, top, - instance, - &debugfs_usecount_fops); - if (!use_count) - goto fail_use_count; - - trace = debugfs_create_file("trace", - 0644, top, - instance, - &debugfs_trace_fops); - if (!trace) - goto fail_trace; - - vchiq_instance_get_debugfs_node(instance)->dentry = top; - return 0; + debugfs_create_file("use_count", 0444, top, instance, + &debugfs_usecount_fops); + debugfs_create_file("trace", 0644, top, instance, &debugfs_trace_fops); -fail_trace: - debugfs_remove(use_count); -fail_use_count: - debugfs_remove(top); -fail_top: - return -ENOMEM; + vchiq_instance_get_debugfs_node(instance)->dentry = top; } void vchiq_debugfs_remove_instance(VCHIQ_INSTANCE_T instance) @@ -314,31 +284,13 @@ void vchiq_debugfs_remove_instance(VCHIQ_INSTANCE_T instance) debugfs_remove_recursive(node->dentry); } -int vchiq_debugfs_init(void) +void vchiq_debugfs_init(void) { - BUG_ON(debugfs_info.vchiq_cfg_dir != NULL); - debugfs_info.vchiq_cfg_dir = debugfs_create_dir("vchiq", NULL); - if (debugfs_info.vchiq_cfg_dir == NULL) - goto fail; - debugfs_info.clients = debugfs_create_dir("clients", vchiq_debugfs_top()); - if (!debugfs_info.clients) - goto fail; - if (vchiq_debugfs_create_log_entries(vchiq_debugfs_top()) != 0) - goto fail; - - return 0; - -fail: - vchiq_debugfs_deinit(); - vchiq_log_error(vchiq_arm_log_level, - "%s: failed to create debugfs directory", - __func__); - - return -ENOMEM; + vchiq_debugfs_create_log_entries(vchiq_debugfs_top()); } /* remove all the debugfs entries */ @@ -360,18 +312,16 @@ static struct dentry *vchiq_debugfs_top(void) #else /* CONFIG_DEBUG_FS */ -int vchiq_debugfs_init(void) +void vchiq_debugfs_init(void) { - return 0; } void vchiq_debugfs_deinit(void) { } -int vchiq_debugfs_add_instance(VCHIQ_INSTANCE_T instance) +void vchiq_debugfs_add_instance(VCHIQ_INSTANCE_T instance) { - return 0; } void vchiq_debugfs_remove_instance(VCHIQ_INSTANCE_T instance) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h index 1d95e3d70621..3af6397ada19 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h @@ -40,11 +40,11 @@ typedef struct vchiq_debugfs_node_struct { struct dentry *dentry; } VCHIQ_DEBUGFS_NODE_T; -int vchiq_debugfs_init(void); +void vchiq_debugfs_init(void); void vchiq_debugfs_deinit(void); -int vchiq_debugfs_add_instance(VCHIQ_INSTANCE_T instance); +void vchiq_debugfs_add_instance(VCHIQ_INSTANCE_T instance); void vchiq_debugfs_remove_instance(VCHIQ_INSTANCE_T instance);