From patchwork Sat Feb 18 00:00:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Derrick X-Patchwork-Id: 9580901 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2B0B860437 for ; Sat, 18 Feb 2017 00:00:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C3FD287A0 for ; Sat, 18 Feb 2017 00:00:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 115BF287A2; Sat, 18 Feb 2017 00:00:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE044287A0 for ; Sat, 18 Feb 2017 00:00:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750766AbdBRAAj (ORCPT ); Fri, 17 Feb 2017 19:00:39 -0500 Received: from mga05.intel.com ([192.55.52.43]:7552 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750918AbdBRAAi (ORCPT ); Fri, 17 Feb 2017 19:00:38 -0500 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP; 17 Feb 2017 16:00:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,173,1484035200"; d="scan'208";a="226771112" Received: from eremita.lm.intel.com ([10.232.112.67]) by fmsmga004.fm.intel.com with ESMTP; 17 Feb 2017 16:00:37 -0800 From: Jon Derrick Cc: Jon Derrick , linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, Scott Bauer , Rafael Antognolli , Jens Axboe , Christoph Hellwig Subject: [PATCHv2 5/5] block/sed: Eliminate state variable Date: Fri, 17 Feb 2017 17:00:29 -0700 Message-Id: <1487376029-22662-6-git-send-email-jonathan.derrick@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1487376029-22662-1-git-send-email-jonathan.derrick@intel.com> References: <1487376029-22662-1-git-send-email-jonathan.derrick@intel.com> To: unlisted-recipients:; (no To-header on input) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that the function data is embedded with the function, there is no need to carry a device state variable. Signed-off-by: Jon Derrick Reviewed-by: Christoph Hellwig --- block/sed-opal.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/block/sed-opal.c b/block/sed-opal.c index e2e3228..791a40a 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -85,7 +85,6 @@ struct opal_dev { sec_send_recv *send_recv; opal_step *funcs; - int state; struct mutex dev_lock; u16 comid; u32 hsn; @@ -377,17 +376,17 @@ static void check_geometry(struct opal_dev *dev, const void *data) static int next(struct opal_dev *dev) { opal_step *func; - int error = 0; + int state = 0, error = 0; do { - func = &dev->funcs[dev->state]; + func = &dev->funcs[state]; if (!func->fn) break; error = func->fn(dev, func->data); if (error) { pr_err("Error on step function: %d with error %d: %s\n", - dev->state, error, + state, error, opal_error_to_human(error)); /* For each OPAL command we do a discovery0 then we @@ -397,10 +396,10 @@ static int next(struct opal_dev *dev) * session. Therefore we shouldn't attempt to terminate * a session, as one has not yet been created. */ - if (dev->state > 1) + if (state > 1) return end_opal_session_error(dev); } - dev->state++; + state++; } while (!error); return error; @@ -1967,14 +1966,12 @@ static int end_opal_session_error(struct opal_dev *dev) { NULL, } }; dev->funcs = error_end_session; - dev->state = 0; return next(dev); } static inline void setup_opal_dev(struct opal_dev *dev, opal_step *funcs) { - dev->state = 0; dev->funcs = funcs; dev->tsn = 0; dev->hsn = 0; @@ -2320,7 +2317,6 @@ bool opal_unlock_from_suspend(struct opal_dev *dev) setup_opal_dev(dev, NULL); list_for_each_entry(suspend, &dev->unlk_lst, node) { - dev->state = 0; dev->tsn = 0; dev->hsn = 0;