From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 3C2EE1CF303 for ; Wed, 18 Nov 2015 12:45:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 354F732ECF for ; Wed, 18 Nov 2015 12:45:30 +0000 (UTC) Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QlVa+CQcPYEg for ; Wed, 18 Nov 2015 12:45:27 +0000 (UTC) Received: from email.microchip.com (exsmtp01.microchip.com [198.175.253.37]) by silver.osuosl.org (Postfix) with ESMTPS id E5C3E32ECD for ; Wed, 18 Nov 2015 12:44:59 +0000 (UTC) From: Christian Gromm Subject: [PATCH 26/28] staging: most: rearrange function aim_write Date: Wed, 18 Nov 2015 13:43:50 +0100 Message-ID: <1447850632-16782-27-git-send-email-christian.gromm@microchip.com> In-Reply-To: <1447850632-16782-1-git-send-email-christian.gromm@microchip.com> References: <1447850632-16782-1-git-send-email-christian.gromm@microchip.com> MIME-Version: 1.0 List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" To: gregkh@linuxfoundation.org Cc: Christian Gromm , driverdev-devel@linuxdriverproject.org This patch rearranges the code of function aim_write() of module aim-cdev. It is needed to remove the error lable and make the code straighter. Signed-off-by: Christian Gromm --- drivers/staging/most/aim-cdev/cdev.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/drivers/staging/most/aim-cdev/cdev.c b/drivers/staging/most/aim-cdev/cdev.c index 0ee2f08..e5ceb82 100644 --- a/drivers/staging/most/aim-cdev/cdev.c +++ b/drivers/staging/most/aim-cdev/cdev.c @@ -183,7 +183,6 @@ static int aim_close(struct inode *inode, struct file *filp) static ssize_t aim_write(struct file *filp, const char __user *buf, size_t count, loff_t *offset) { - int ret, err; size_t actual_len; size_t max_len; ssize_t retval; @@ -202,8 +201,8 @@ static ssize_t aim_write(struct file *filp, const char __user *buf, } if (unlikely(!c->dev)) { - err = -EPIPE; - goto error; + mutex_unlock(&c->io_mutex); + return -EPIPE; } max_len = c->cfg->buffer_size; @@ -212,23 +211,14 @@ static ssize_t aim_write(struct file *filp, const char __user *buf, retval = copy_from_user(mbo->virt_address, buf, mbo->buffer_length); if (retval) { - err = -EIO; - goto error; + most_put_mbo(mbo); + mutex_unlock(&c->io_mutex); + return -EIO; } - ret = most_submit_mbo(mbo); - if (ret) { - pr_info("submitting MBO to core failed\n"); - err = ret; - goto error; - } + most_submit_mbo(mbo); mutex_unlock(&c->io_mutex); return actual_len - retval; -error: - if (mbo) - most_put_mbo(mbo); - mutex_unlock(&c->io_mutex); - return err; } /** -- 1.7.9.5 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel