OSDN Git Service

staging: gasket: remove unnecessary NULL checks on calls from VFS
authorTodd Poynor <toddpoynor@google.com>
Sat, 21 Jul 2018 13:34:59 +0000 (06:34 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Jul 2018 11:56:46 +0000 (13:56 +0200)
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 <groeck@chromium.org>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/gasket/gasket_core.c

index 11ab049..e82f8ce 100644 (file)
@@ -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(