From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752429AbbCXMSB (ORCPT ); Tue, 24 Mar 2015 08:18:01 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:35020 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752331AbbCXMRz (ORCPT ); Tue, 24 Mar 2015 08:17:55 -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 2/4] staging: unisys: use local dev_t instead of global Date: Tue, 24 Mar 2015 17:47:35 +0530 Message-Id: <1427199457-11771-2-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1427199457-11771-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1427199457-11771-1-git-send-email-sudipm.mukherjee@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org the dev_t is stored in visorchipset_platform_device.dev.devt, so we can pass that value as an argument to visorchipset_file_cleanup() instead of using the global variable in file.c 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 | 3 +-- drivers/staging/unisys/visorchipset/file.h | 2 +- drivers/staging/unisys/visorchipset/visorchipset_main.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/unisys/visorchipset/file.c b/drivers/staging/unisys/visorchipset/file.c index cbed1ba2..d62908d 100644 --- a/drivers/staging/unisys/visorchipset/file.c +++ b/drivers/staging/unisys/visorchipset/file.c @@ -76,13 +76,12 @@ visorchipset_file_init(dev_t major_dev, struct visorchannel **controlvm_channel) } void -visorchipset_file_cleanup(void) +visorchipset_file_cleanup(dev_t majordev) { if (file_cdev.ops != NULL) cdev_del(&file_cdev); file_cdev.ops = NULL; unregister_chrdev_region(majordev, 1); - majordev = MKDEV(0, 0); registered = FALSE; } diff --git a/drivers/staging/unisys/visorchipset/file.h b/drivers/staging/unisys/visorchipset/file.h index dc7a195..b32a472 100644 --- a/drivers/staging/unisys/visorchipset/file.h +++ b/drivers/staging/unisys/visorchipset/file.h @@ -22,6 +22,6 @@ int visorchipset_file_init(dev_t majorDev, struct visorchannel **pControlVm_channel); -void visorchipset_file_cleanup(void); +void visorchipset_file_cleanup(dev_t majordev); #endif diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c index 9c8605d..f2663d2c 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset_main.c +++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c @@ -2278,7 +2278,7 @@ visorchipset_exit(void) visorchannel_destroy(controlvm_channel); - visorchipset_file_cleanup(); + visorchipset_file_cleanup(visorchipset_platform_device.dev.devt); POSTCODE_LINUX_2(DRIVER_EXIT_PC, POSTCODE_SEVERITY_INFO); } -- 1.8.1.2