staging: gasket: remove duplicate call to retrieve device callback

gasket_handle_ioctl() calls gasket_get_ioctl_permissions_cb() twice;
simplify the code and avoid duplicated work by fetching the callback
pointer only once.

Reported-by: Dmitry Torokhov <dtor@chromium.org>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gasket/gasket_ioctl.c b/drivers/staging/gasket/gasket_ioctl.c
index 2e2c9b997093b349c4e096ad4ca7fb0c63cae077..dbe9fdef0c26882709dae0053ec9adb4eb978e43 100644 (file)
--- a/drivers/staging/gasket/gasket_ioctl.c
+++ b/drivers/staging/gasket/gasket_ioctl.c
@@ -55,14 +55,15 @@ long gasket_handle_ioctl(struct file *filp, uint cmd, void __user *argp)
 {
        struct gasket_dev *gasket_dev;
        unsigned long arg = (unsigned long)argp;
+       gasket_ioctl_permissions_cb_t ioctl_permissions_cb;
        int retval;
 
        gasket_dev = (struct gasket_dev *)filp->private_data;
        trace_gasket_ioctl_entry(gasket_dev->dev_info.name, cmd);
 
-       if (gasket_get_ioctl_permissions_cb(gasket_dev)) {
-               retval = gasket_get_ioctl_permissions_cb(gasket_dev)(
-                       filp, cmd, argp);
+       ioctl_permissions_cb = gasket_get_ioctl_permissions_cb(gasket_dev);
+       if (ioctl_permissions_cb) {
+               retval = ioctl_permissions_cb(filp, cmd, argp);
                if (retval < 0) {
                        trace_gasket_ioctl_exit(-EPERM);
                        return retval;