Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754081AbbLAGQI (ORCPT ); Tue, 1 Dec 2015 01:16:08 -0500 Received: from mail-pa0-f53.google.com ([209.85.220.53]:34706 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750981AbbLAGQG (ORCPT ); Tue, 1 Dec 2015 01:16:06 -0500 From: Sudip Mukherjee To: Benjamin Romer , David Kershner , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, sparmaintainer@unisys.com, devel@driverdev.osuosl.org, Sudip Mukherjee Subject: [PATCH] staging: unisys: use common return path Date: Tue, 1 Dec 2015 11:45:55 +0530 Message-Id: <1448950555-8846-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1942 Lines: 59 The success path and the error path both are first doing spin_unlock_irqrestore() before returning. Use that in the common path and return the success/error value. Signed-off-by: Sudip Mukherjee --- It is dependent on the patch series sent by Benjamin (Nov 30th). drivers/staging/unisys/visornic/visornic_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c index 77fd1ef..342c0bf 100644 --- a/drivers/staging/unisys/visornic/visornic_main.c +++ b/drivers/staging/unisys/visornic/visornic_main.c @@ -357,15 +357,16 @@ visornic_serverdown(struct visornic_devdata *devdata, visorbus_state_complete_func complete_func) { unsigned long flags; + int retval = 0; spin_lock_irqsave(&devdata->priv_lock, flags); if (!devdata->server_down && !devdata->server_change_state) { if (devdata->going_away) { - spin_unlock_irqrestore(&devdata->priv_lock, flags); dev_dbg(&devdata->dev->device, "%s aborting because device removal pending\n", __func__); - return -ENODEV; + retval = -ENODEV; + goto error; } devdata->server_change_state = true; devdata->server_down_complete_func = complete_func; @@ -374,11 +375,12 @@ visornic_serverdown(struct visornic_devdata *devdata, } else if (devdata->server_change_state) { dev_dbg(&devdata->dev->device, "%s changing state\n", __func__); - spin_unlock_irqrestore(&devdata->priv_lock, flags); - return -EINVAL; + retval = -EINVAL; } + +error: spin_unlock_irqrestore(&devdata->priv_lock, flags); - return 0; + return retval; } /** -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/