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

Commit 99ccddf5 authored by Todd Poynor's avatar Todd Poynor Committed by Greg Kroah-Hartman
Browse files

staging: gasket: remove unnecessary NULL checks on calls from VFS 



Remove unneeded checks for NULL pointers in struct file pointers passed
from the VFS layer or the private_data that must have been properly set
at file open time.

Reported-by: default avatarGuenter Roeck <groeck@chromium.org>
Signed-off-by: default avatarTodd Poynor <toddpoynor@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a1978fa2

drivers/staging/gasket/gasket_core.c

+0 −15
Original line number Diff line number Diff line
@@ -1587,11 +1587,6 @@ static int gasket_mmap(struct file *filp, struct vm_area_struct *vma) 
	int num_map_regions = 0;

	enum do_map_region_status map_status;



	if (!gasket_dev) {

		gasket_nodev_error("Unable to retrieve device data");

		trace_gasket_mmap_exit(-EINVAL);

		return -EINVAL;

	}

	driver_desc = gasket_dev->internal_desc->driver_desc;



	if (vma->vm_start & ~PAGE_MASK) {
@@ -1785,17 +1780,7 @@ static long gasket_ioctl(struct file *filp, uint cmd, ulong arg) 
	void __user *argp = (void __user *)arg;

	char path[256];



	if (!filp)

		return -ENODEV;



	gasket_dev = (struct gasket_dev *)filp->private_data;

	if (!gasket_dev) {

		gasket_nodev_error(

			"Unable to find Gasket structure for file %s",

			d_path(&filp->f_path, path, 256));

		return -ENODEV;

	}



	driver_desc = gasket_dev->internal_desc->driver_desc;

	if (!driver_desc) {

		gasket_log_error(