Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61986f73 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman
Browse files

staging: unisys: remove redundant variable 



remove the variable "registered", which was used in the cleanup() to
detect if the driver has successfully initialized. the cleanup()
is called from module_exit, so its obvious that the module has
successfully initialized. if the initialization had failed, then
we will never be in the cleanup().

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8ee775f9

drivers/staging/unisys/visorchipset/file.c

+3 −9
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
static struct cdev file_cdev;

static struct visorchannel **file_controlvm_channel;

static dev_t majordev = -1; /**< indicates major num for device */

static BOOL registered = FALSE;



static int visorchipset_open(struct inode *inode, struct file *file);

static int visorchipset_release(struct inode *inode, struct file *file);
@@ -62,12 +61,10 @@ visorchipset_file_init(dev_t major_dev, struct visorchannel **controlvm_channel) 
		/* dynamic major device number registration required */

		if (alloc_chrdev_region(&majordev, 0, 1, MYDRVNAME) < 0)

			return -1;

		registered = TRUE;

	} else {

		/* static major device number registration required */

		if (register_chrdev_region(majordev, 1, MYDRVNAME) < 0)

			return -1;

		registered = TRUE;

	}

	rc = cdev_add(&file_cdev, MKDEV(MAJOR(majordev), 0), 1);

	if (rc  < 0)
@@ -81,13 +78,10 @@ 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;

	}

}



static int