media: dvb_frontend: cleanup dvb_frontend_ioctl_properties()

commit 2b5df42b8dec69fb926a242007fd462343db4408 upstream

Use a switch() on this function, just like on other ioctl
handlers and handle parameters inside each part of the
switch.

That makes it easier to integrate with the already existing
ioctl handler function.

Reviewed-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index 2bf55a786e297fc07224a98ac804b3e5a2187cfe..c446f51be21a909fb323a2df4c511257fbaa0371 100644 (file)
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -1956,21 +1956,25 @@ static int dvb_frontend_ioctl_properties(struct file *file,
        struct dvb_frontend *fe = dvbdev->priv;
        struct dvb_frontend_private *fepriv = fe->frontend_priv;
        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
-       int err = 0;
-
-       struct dtv_properties *tvps = parg;
-       struct dtv_property *tvp = NULL;
-       int i;
+       int err, i;
 
        dev_dbg(fe->dvb->device, "%s:\n", __func__);
 
-       if (cmd == FE_SET_PROPERTY) {
-               dev_dbg(fe->dvb->device, "%s: properties.num = %d\n", __func__, tvps->num);
-               dev_dbg(fe->dvb->device, "%s: properties.props = %p\n", __func__, tvps->props);
+       switch(cmd) {
+       case FE_SET_PROPERTY: {
+               struct dtv_properties *tvps = parg;
+               struct dtv_property *tvp = NULL;
+
+               dev_dbg(fe->dvb->device, "%s: properties.num = %d\n",
+                       __func__, tvps->num);
+               dev_dbg(fe->dvb->device, "%s: properties.props = %p\n",
+                       __func__, tvps->props);
 
-               /* Put an arbitrary limit on the number of messages that can
-                * be sent at once */
-               if ((tvps->num == 0) || (tvps->num > DTV_IOCTL_MAX_MSGS))
+               /*
+                * Put an arbitrary limit on the number of messages that can
+                * be sent at once
+                */
+               if (!tvps->num || (tvps->num > DTV_IOCTL_MAX_MSGS))
                        return -EINVAL;
 
                tvp = memdup_user(tvps->props, tvps->num * sizeof(*tvp));
@@ -1979,23 +1983,34 @@ static int dvb_frontend_ioctl_properties(struct file *file,
 
                for (i = 0; i < tvps->num; i++) {
                        err = dtv_property_process_set(fe, tvp + i, file);
-                       if (err < 0)
-                               goto out;
+                       if (err < 0) {
+                               kfree(tvp);
+                               return err;
+                       }
                        (tvp + i)->result = err;
                }
 
                if (c->state == DTV_TUNE)
                        dev_dbg(fe->dvb->device, "%s: Property cache is full, tuning\n", __func__);
 
-       } else if (cmd == FE_GET_PROPERTY) {
+               kfree(tvp);
+               break;
+       }
+       case FE_GET_PROPERTY: {
+               struct dtv_properties *tvps = parg;
+               struct dtv_property *tvp = NULL;
                struct dtv_frontend_properties getp = fe->dtv_property_cache;
 
-               dev_dbg(fe->dvb->device, "%s: properties.num = %d\n", __func__, tvps->num);
-               dev_dbg(fe->dvb->device, "%s: properties.props = %p\n", __func__, tvps->props);
+               dev_dbg(fe->dvb->device, "%s: properties.num = %d\n",
+                       __func__, tvps->num);
+               dev_dbg(fe->dvb->device, "%s: properties.props = %p\n",
+                       __func__, tvps->props);
 
-               /* Put an arbitrary limit on the number of messages that can
-                * be sent at once */
-               if ((tvps->num == 0) || (tvps->num > DTV_IOCTL_MAX_MSGS))
+               /*
+                * Put an arbitrary limit on the number of messages that can
+                * be sent at once
+                */
+               if (!tvps->num || (tvps->num > DTV_IOCTL_MAX_MSGS))
                        return -EINVAL;
 
                tvp = memdup_user(tvps->props, tvps->num * sizeof(*tvp));
@@ -2010,28 +2025,32 @@ static int dvb_frontend_ioctl_properties(struct file *file,
                 */
                if (fepriv->state != FESTATE_IDLE) {
                        err = dtv_get_frontend(fe, &getp, NULL);
-                       if (err < 0)
-                               goto out;
+                       if (err < 0) {
+                               kfree(tvp);
+                               return err;
+                       }
                }
                for (i = 0; i < tvps->num; i++) {
                        err = dtv_property_process_get(fe, &getp, tvp + i, file);
-                       if (err < 0)
-                               goto out;
+                       if (err < 0) {
+                               kfree(tvp);
+                               return err;
+                       }
                        (tvp + i)->result = err;
                }
 
                if (copy_to_user((void __user *)tvps->props, tvp,
                                 tvps->num * sizeof(struct dtv_property))) {
-                       err = -EFAULT;
-                       goto out;
+                       kfree(tvp);
+                       return -EFAULT;
                }
-
-       } else
-               err = -EOPNOTSUPP;
-
-out:
-       kfree(tvp);
-       return err;
+               kfree(tvp);
+               break;
+       }
+       default:
+               return -ENOTSUPP;
+       } /* switch */
+       return 0;
 }
 
 static int dtv_set_frontend(struct dvb_frontend *fe)