From patchwork Mon Jun 29 14:04:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11631013 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B42ED912 for ; Mon, 29 Jun 2020 14:09:31 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 70A7623D99 for ; Mon, 29 Jun 2020 14:09:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="j6H6rCU4"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="CITmqLc3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 70A7623D99 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=00H9Kc+Mqk6nk+Lq6rQR0rtWpmv/Ysbbz5l4zTJ7Xp4=; b=j6H6rCU4dbiPtyF2TvG8LOZYn ZfBhXladejbZ70erbguyYqjrINtOwBCoTSW0zSophkBhs1CwFDMmV2Ut+X8t5CYOAfjbYFlOGiGqi AmBDDFuePExD1xgbQ5i1hhPFSANk8b69635bxxU+yaAsLTcidcWOaJgRg1Ppq1/Osnh2fJly3WyOw 6oZHCT4VS6Tk8GfzSFFERbaLAtJBJZFBcTRFCBpBXUOFXdrEFFBzp/XaOV4hJhj94Uy9FiDm8mwY/ nO1wppTvkAklLktsdW2fpf/mRDgePd2VzKf2DCuOp4N9YtnJRRs5dqiVXUxeW+jvUiaoFi5AfZN0d gnVlCmmPA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jpuRE-0005H5-4I; Mon, 29 Jun 2020 14:07:12 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jpuPE-0004Hh-5G for linux-arm-kernel@lists.infradead.org; Mon, 29 Jun 2020 14:05:10 +0000 Received: by mail-wr1-x444.google.com with SMTP id h5so16666338wrc.7 for ; Mon, 29 Jun 2020 07:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ObKoaiwUBMsH7RgwRp2nwwP2sLs2C+zRlkZVkrEZxL8=; b=CITmqLc3nbGdsGtKVJszDGHLgzCb7zsuvkz+o0c8ghMxDpU6eESRHcmbaHok/SMQ2R 3BU+t5KbBGhwJFZI+r+/nkGDxLbMDFjegBajaC6W6wItOi04H/OIE/Hth21EIcoxTgPS zEG/Pxz8a4/dNmmparDp0h0BLY0sTcsOeYI4rE6yK7E6G6mLkhST9OS1rTALTq79Fozc 74S2ArYQU1OOHSZ/moJCDIwcmWgFtR5hTcH7/j3iFTt3wuPylApkTXnwcx5VF99WNeKD RJvoNJm9t4E/z0j1kjIWLSVgkJIarplQvWgTVfehAFzcmf0+Zp+yvd8G5B8KZftONrdD 4z5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ObKoaiwUBMsH7RgwRp2nwwP2sLs2C+zRlkZVkrEZxL8=; b=heAjJixfnWBMSE3G7XXjjxTZj8L+I6y5tUSyiDmXHdCozlkOpVd0x0y1yOUUJZHmSw VtzZoxk+F3o2ucgUwWFszoQzO6v63zQVy3BScjbOGRSycBWYfIp/hmlN5wAcfUie/tx+ 1YmqN8eAqTxX77WhcTdDejAXEfNLH74jcBno/hSMFUwiT798fW7HCmf0MRrnu9aovqdI HS+QbeSl1Mpz1eRjoKXLr4DvO/+lplmzprM2r5Ia+o/yBgjazo5FYgQ0CyglnWo1yySr SjDqMEy4Y/oaq1p2dk4Y9GlJn2AtKk6ziTlOtjTf9K6OkTcscNb0Y+OWE3bNG2dIzLoF YGpw== X-Gm-Message-State: AOAM531mZE1Q7Hv4Lh3rn9t/hUldQqmBahbXQA8tFtWo4QfI+7VLsf0s PpYrBBwxjR+w9riN7zlvvw6VQA== X-Google-Smtp-Source: ABdhPJxkqzk0GPRCr9K1MAup+ksNzBdsY/taKwJeGxTcrmTr/Z34GpJMd3SoWqWuUsqXZ3BvIKddTg== X-Received: by 2002:adf:fe0e:: with SMTP id n14mr16825329wrr.325.1593439507115; Mon, 29 Jun 2020 07:05:07 -0700 (PDT) Received: from localhost.localdomain ([2.27.35.144]) by smtp.gmail.com with ESMTPSA id p14sm15394928wrj.14.2020.06.29.07.05.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 07:05:06 -0700 (PDT) From: Lee Jones To: arnd@arndb.de, gregkh@linuxfoundation.org Subject: [PATCH 17/20] misc: genwqe: card_base: Do not pass unused argument 'fatal_err' Date: Mon, 29 Jun 2020 15:04:39 +0100 Message-Id: <20200629140442.1043957-18-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629140442.1043957-1-lee.jones@linaro.org> References: <20200629140442.1043957-1-lee.jones@linaro.org> MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:444 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joerg-Stephan Vogt , Michael Ruettger , Frank Haverkamp , linux-kernel@vger.kernel.org, Michael Jung , Lee Jones , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 'fatal_err' is taken as an argument to a static function which is only invoked once. During this invocation 'fatal_err' is not set. There doesn't appear to be a good reason to keep it around. Also fixes the following W=1 kernel build warning: drivers/misc/genwqe/card_base.c:588: warning: Function parameter or member 'fatal_err' not described in 'genwqe_recover_card' Cc: Michael Jung Cc: Michael Ruettger Cc: Frank Haverkamp Cc: Joerg-Stephan Vogt Signed-off-by: Lee Jones --- drivers/misc/genwqe/card_base.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/misc/genwqe/card_base.c b/drivers/misc/genwqe/card_base.c index bceebf49de2d5..809a6f46f6de3 100644 --- a/drivers/misc/genwqe/card_base.c +++ b/drivers/misc/genwqe/card_base.c @@ -569,30 +569,18 @@ static int genwqe_stop(struct genwqe_dev *cd) /** * genwqe_recover_card() - Try to recover the card if it is possible - * - * If fatal_err is set no register access is possible anymore. It is - * likely that genwqe_start fails in that situation. Proper error - * handling is required in this case. + * @cd: GenWQE device information * * genwqe_bus_reset() will cause the pci code to call genwqe_remove() * and later genwqe_probe() for all virtual functions. */ -static int genwqe_recover_card(struct genwqe_dev *cd, int fatal_err) +static int genwqe_recover_card(struct genwqe_dev *cd) { int rc; struct pci_dev *pci_dev = cd->pci_dev; genwqe_stop(cd); - /* - * Make sure chip is not reloaded to maintain FFDC. Write SLU - * Reset Register, CPLDReset field to 0. - */ - if (!fatal_err) { - cd->softreset = 0x70ull; - __genwqe_writeq(cd, IO_SLC_CFGREG_SOFTRESET, cd->softreset); - } - rc = genwqe_bus_reset(cd); if (rc != 0) { dev_err(&pci_dev->dev, @@ -958,7 +946,7 @@ static int genwqe_health_thread(void *data) cd->card_state = GENWQE_CARD_FATAL_ERROR; - rc = genwqe_recover_card(cd, 0); + rc = genwqe_recover_card(cd); if (rc < 0) { /* FIXME Card is unusable and needs unbind! */ goto fatal_error;