From: Todd Poynor Date: Sat, 21 Jul 2018 13:34:55 +0000 (-0700) Subject: staging: gasket: remove duplicate call to retrieve device callback X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=996e650030857e791416af81d7d9171d9652bd9d;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Todd Poynor Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/gasket/gasket_ioctl.c b/drivers/staging/gasket/gasket_ioctl.c index 2e2c9b997093..dbe9fdef0c26 100644 --- 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;