From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752361AbbCXMRx (ORCPT ); Tue, 24 Mar 2015 08:17:53 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:33070 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752275AbbCXMRw (ORCPT ); Tue, 24 Mar 2015 08:17:52 -0400 From: Sudip Mukherjee To: Benjamin Romer , David Kershner , Greg Kroah-Hartman Cc: sparmaintainer@unisys.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Dan Carpenter , Sudip Mukherjee Subject: [PATCH v4 1/4] staging: unisys: remove unneeded comparison Date: Tue, 24 Mar 2015 17:47:34 +0530 Message-Id: <1427199457-11771-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.8.1.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org visorchipset_file_cleanup() is called from visorchipset_exit() which is the module_exit function and this function is executing means module_init succeeded, so registered will always be true at this time. and majordev has also been initialized in the init function. hence these comparisons will always be true. Signed-off-by: Sudip Mukherjee --- v4: messed up the subject in v3 v3: broke the previous patch in this series drivers/staging/unisys/visorchipset/file.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/staging/unisys/visorchipset/file.c b/drivers/staging/unisys/visorchipset/file.c index 9ca7f1e..cbed1ba2 100644 --- a/drivers/staging/unisys/visorchipset/file.c +++ b/drivers/staging/unisys/visorchipset/file.c @@ -81,13 +81,9 @@ visorchipset_file_cleanup(void) if (file_cdev.ops != NULL) cdev_del(&file_cdev); file_cdev.ops = NULL; - if (registered) { - if (MAJOR(majordev) >= 0) { - unregister_chrdev_region(majordev, 1); - majordev = MKDEV(0, 0); - } - registered = FALSE; - } + unregister_chrdev_region(majordev, 1); + majordev = MKDEV(0, 0); + registered = FALSE; } static int -- 1.8.1.2