mei: enable adding more IOCTL handlers

Handle ioctls in a switch statement so we can
add more commands easily
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/misc/mei/main.c

@@ -523,8 +523,6 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data)
 	struct mei_connect_client_data *connect_data = NULL;
 	int rets;
 
-	if (cmd != IOCTL_MEI_CONNECT_CLIENT)
-		return -EINVAL;
 
 	if (WARN_ON(!cl || !cl->dev))
 		return -ENODEV;
@@ -539,15 +537,16 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data)
 		goto out;
 	}
 
+	switch (cmd) {
+	case IOCTL_MEI_CONNECT_CLIENT:
 		dev_dbg(&dev->pdev->dev, ": IOCTL_MEI_CONNECT_CLIENT.\n");
-
 		connect_data = kzalloc(sizeof(struct mei_connect_client_data),
 							GFP_KERNEL);
 		if (!connect_data) {
 			rets = -ENOMEM;
 			goto out;
 		}
-	dev_dbg(&dev->pdev->dev, "copy connect data from user\n");
+
 		if (copy_from_user(connect_data, (char __user *)data,
 				sizeof(struct mei_connect_client_data))) {
 			dev_dbg(&dev->pdev->dev, "failed to copy data from userland\n");
@@ -556,12 +555,10 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data)
 		}
 
 		rets = mei_ioctl_connect_client(file, connect_data);
-
-	/* if all is ok, copying the data back to user. */
 		if (rets)
 			goto out;
 
-	dev_dbg(&dev->pdev->dev, "copy connect data to user\n");
+		/* if all is ok, copying the data back to user. */
 		if (copy_to_user((char __user *)data, connect_data,
 				sizeof(struct mei_connect_client_data))) {
 			dev_dbg(&dev->pdev->dev, "failed to copy data to userland\n");
@@ -569,6 +566,12 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data)
 			goto out;
 		}
 
+		break;
+	default:
+		dev_err(&dev->pdev->dev, ": unsupported ioctl %d.\n", cmd);
+		rets = -ENOIOCTLCMD;
+	}
+
 out:
 	kfree(connect_data);
 	mutex_unlock(&dev->device_lock);