From patchwork Fri May 5 19:46:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98698 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292885qge; Fri, 5 May 2017 12:48:47 -0700 (PDT) X-Received: by 10.98.138.145 with SMTP id o17mr17894742pfk.69.1494013727330; Fri, 05 May 2017 12:48:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013727; cv=none; d=google.com; s=arc-20160816; b=nHj7aRSP3pp40LFxMTac9XkOWURsBfDB8nPx3fEfVZ8TPL5NMiiw3fN+eoellJsJQB Ou4XgNIwQXRpI2iFD2RoQnqYfOcA14u4hUzBRSaPqiYTLz6IPibzw7YK9KRoonznLP33 nFt07sGYh5ARs/i9Vu1u+/3C02H6dlyw09OFKuNEw2ZZm5i9ktMQOelCxZ1bK2VRNjVK cEZfvoV1C844LMymSYXct2MpOz4sY43EFw6SxngECj7ynELzsNnSYp4bPVPGpbrcToJP n95oQx/5F0Jxx6OPEYYptVRQb98FDtgGU3hO1yjLrmA79imvjaopx0bHVIOnv+e5iXIZ IivA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=ETHIzzz5HMXrQ8LNhNduoDeN2AxpjaU7Gi/grMVOktI=; b=TgzXcUbZJqo0YACpBG6bdOj4yT8GCFencweNz2+QkNQR2JIJzcn3No7uq7NNvM0xzG yTd7vrzrSmcCOsldJt2RsKyJSiks0MBnT0hUVMJs8XyU6+hYwNRSdTKdjG6/HZtnB70N hfuEvPKd+eN/dEAgOPWZPSsC06LnMpZ7l9/pi/91kpn7Y0smbjtdA4AXD+AebCArmc2o AYov8LNkiwP0J7zYOj/kt1gkP7upXNVLX6wO9Rg8jafvTKXWcfTPuaHb79Bxqt+qRSj1 Hw70OSSX+HTAaMmbDnxttbooCg9WIqOH094wWNDAr69lJU05gkCyBoBksSduiV9QbPrB kZiQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.47; Fri, 05 May 2017 12:48:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755826AbdEETso (ORCPT + 6 others); Fri, 5 May 2017 15:48:44 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:56292 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755654AbdEETsg (ORCPT ); Fri, 5 May 2017 15:48:36 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lawjh-1dmhr42L1d-00kkAG; Fri, 05 May 2017 21:48:15 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Anil Gurumurthy , James Bottomley , Arnd Bergmann Subject: [PATCH 3.16-stable 36/87] bfa: Fix indentation Date: Fri, 5 May 2017 21:46:54 +0200 Message-Id: <20170505194745.3627137-37-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:dCgr7oRV9lSos80LTIHGhTtm0IChLgKD5y45gpxN4aI85SfaDr5 oX8f1iBMjZ4tHmN50Lvqq11xhRfxxurAhkv4XQE3/X6wucFRN6x8FVpV0V49s42VwMO19H5 pXy2GPqNG3WRuanNsNynj94QdpPtRGAHpU0oBiWdwNY49mzG6k19fPSBFBwMd7v994SFgaQ ExakmefyfbHxuRKcyYOgA== X-UI-Out-Filterresults: notjunk:1; V01:K0:blikDFbOY2g=:VENR1ra7wzYVd9/P9SN7UC h1sOER+n4kpXDdmHmYjQFRzsvajzSxGHfA3v7NTM2n5451rCwDig5PhKjVBamSgoNdYoI0/fi 0jusqcnvLBzmYn/YkBbp2iz7dB0XbOqR6418McvyLtIgiOuOOAJcuI4oXQ3sf6WJlwoHchFKi vyKKN61Fm/JgECFVUdRwzMrWEzlcWoSv4jiFyDBvIb0b72plV/AqTWTdUXdMTR/EMPSqNzZQP Y2HNzLqyLcnUXz2vYw9Cnh/oX8VUP/5JtKePpzDuO8Y1YbT303YSvtzco1Io7ZkFCBV2ohotj I+l12lQsJ9CZjedyVf1++cx+G7yQpUwpyDikVIFVuWkgAwxK30hYwQ+YdO+fxwdwH0/d3hmFP /g5ibTAR46cNijhL2+130aBNnmim3zOs1jGiqvwB7J4UC9MLMETz4rUhTnBuTkG3G7YWE/2m4 wgFi1rceqrvA/jWAvjvSfGHB4HjerNRvOp3G07/3e6KibMru3Q0CFrVXldX84zNknmOC0NQI8 5MS4r+54My885vjqOevGbF7SKaDaEZEik65Xz2YDn23AO9bhqrSxh1nS/DY99zG9f5NNpPrSk MTp85dtwlJmCaur9k5znxudw+yh8hsUAeuunv3Yh99GAs0Gx/efPq0IJZrbBn9dnTeRVmewRG sgHRKv55WLznKO8j8ji7G1TBY1GPYE/WaIA/anFQ0Ag02ISvmSO07cvcQ2gQPfN2w5Gg= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Anil Gurumurthy Commit 956d6c6aacb80fc4f6ed2cb9e2aca0deb2ae3657 upstream. Signed-off-by: Anil Gurumurthy Tested-by : Sudarasana Kalluru Reviewed-by: Ewan D. Milne Signed-off-by: James Bottomley Signed-off-by: Arnd Bergmann --- drivers/scsi/bfa/bfa_ioc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/bfa/bfa_ioc.c b/drivers/scsi/bfa/bfa_ioc.c index 315d6d6dcfc8..4e7104461f09 100644 --- a/drivers/scsi/bfa/bfa_ioc.c +++ b/drivers/scsi/bfa/bfa_ioc.c @@ -3665,19 +3665,19 @@ bfa_cb_sfp_state_query(struct bfa_sfp_s *sfp) if (sfp->state_query_cbfn) sfp->state_query_cbfn(sfp->state_query_cbarg, sfp->status); - sfp->media = NULL; - } + sfp->media = NULL; + } - if (sfp->portspeed) { - sfp->status = bfa_sfp_speed_valid(sfp, sfp->portspeed); - if (sfp->state_query_cbfn) - sfp->state_query_cbfn(sfp->state_query_cbarg, - sfp->status); - sfp->portspeed = BFA_PORT_SPEED_UNKNOWN; - } + if (sfp->portspeed) { + sfp->status = bfa_sfp_speed_valid(sfp, sfp->portspeed); + if (sfp->state_query_cbfn) + sfp->state_query_cbfn(sfp->state_query_cbarg, + sfp->status); + sfp->portspeed = BFA_PORT_SPEED_UNKNOWN; + } - sfp->state_query_lock = 0; - sfp->state_query_cbfn = NULL; + sfp->state_query_lock = 0; + sfp->state_query_cbfn = NULL; } /*