Commit 996e6500 authored by Todd Poynor's avatar Todd Poynor Committed by Greg Kroah-Hartman

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: default avatarDmitry Torokhov <dtor@chromium.org>
Signed-off-by: default avatarTodd Poynor <toddpoynor@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 59ab5af7
...@@ -55,14 +55,15 @@ long gasket_handle_ioctl(struct file *filp, uint cmd, void __user *argp) ...@@ -55,14 +55,15 @@ long gasket_handle_ioctl(struct file *filp, uint cmd, void __user *argp)
{ {
struct gasket_dev *gasket_dev; struct gasket_dev *gasket_dev;
unsigned long arg = (unsigned long)argp; unsigned long arg = (unsigned long)argp;
gasket_ioctl_permissions_cb_t ioctl_permissions_cb;
int retval; int retval;
gasket_dev = (struct gasket_dev *)filp->private_data; gasket_dev = (struct gasket_dev *)filp->private_data;
trace_gasket_ioctl_entry(gasket_dev->dev_info.name, cmd); trace_gasket_ioctl_entry(gasket_dev->dev_info.name, cmd);
if (gasket_get_ioctl_permissions_cb(gasket_dev)) { ioctl_permissions_cb = gasket_get_ioctl_permissions_cb(gasket_dev);
retval = gasket_get_ioctl_permissions_cb(gasket_dev)( if (ioctl_permissions_cb) {
filp, cmd, argp); retval = ioctl_permissions_cb(filp, cmd, argp);
if (retval < 0) { if (retval < 0) {
trace_gasket_ioctl_exit(-EPERM); trace_gasket_ioctl_exit(-EPERM);
return retval; return retval;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment