From 99ccddf5af6f32f501e719024e5e699565c6552e Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Sat, 21 Jul 2018 06:34:59 -0700 Subject: 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: Guenter Roeck Signed-off-by: Todd Poynor Signed-off-by: Greg Kroah-Hartman --- drivers/staging/gasket/gasket_core.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'drivers/staging/gasket/gasket_core.c') diff --git a/drivers/staging/gasket/gasket_core.c b/drivers/staging/gasket/gasket_core.c index 11ab04985449..e82f8ce39c9f 100644 --- a/drivers/staging/gasket/gasket_core.c +++ b/drivers/staging/gasket/gasket_core.c @@ -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( -- cgit v1.2.3-55-g7522