From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41689C433E1 for ; Fri, 14 Aug 2020 11:40:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1F51B20771 for ; Fri, 14 Aug 2020 11:40:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="LbwbzR99" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728294AbgHNLkm (ORCPT ); Fri, 14 Aug 2020 07:40:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728247AbgHNLkZ (ORCPT ); Fri, 14 Aug 2020 07:40:25 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4404C061385 for ; Fri, 14 Aug 2020 04:40:24 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id r2so8075808wrs.8 for ; Fri, 14 Aug 2020 04:40:24 -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=wnguWj4FHs1wYikfJFD7vPPZkiV7VFRSyv4gDXDI9Cc=; b=LbwbzR99qF4HU6fI2SPoxXR8GJqzSwmGkTxEIz81e27IwOWhCZ3RzRHRl4xJVFUNQr btIKzVXwXSGX76vYD1mTzdCVFk8kHXH+jG8Anf1IfGeEOFUIvuTeVvSfI2GpP/69rth9 9wOw8+FUuE3/1qj4RKFWa6GbNzFnjfZEE7moD1Na0ROEfz92cpV6Ddz9/qJaeA/OKa5C 2YJO/cfUkYlKSC82bdOD8jZHQE8ROKKaUnUkG9QQIlBP1AvZtypcVTiCStJNj7JGtAvi iBrnj3ehsK2/gVbc1t9rf4e2FTv/SQF0I5mOf3fde7lj9tvzhTXP9+p95A4uMxwTYA5y Vm7A== 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=wnguWj4FHs1wYikfJFD7vPPZkiV7VFRSyv4gDXDI9Cc=; b=QMg8QbthnG6M5i8ourjdZmGne/bi56chWR9D+B2EjOXAjj7r0n0Zk6fYHIzXYtLsew SkNCZEFA9nsuNIg3wH7IBMhr8vg6oQqJO35XBu+YdmMR/Ct48WP+Dc9yYmGvJgYJTlrR Hi/Bd6qS1Ds+A0qwVknXwm9CP9JJY9HhuT1VYqidie3c3fISecxF45cGZBHeUGw/J8KV MnQjE//Frbaxz7C/4c+ScLtl+fVk6aiktAZ8I0S0jAVR0SHBq1BJe8BchDo9Ff4MF8Z8 ItLNE8KHsEXReJ1abyMO5NkeIifCTCITOV3ayGICyNDkG7nTIkIyWzN5TsLPMdsDDODn 2z7g== X-Gm-Message-State: AOAM532IdQMaWApoB2GySb3JOQQl+esSMuFeW6kUuQBfZfqWgILUk/q6 YM4vP44S40zfyG8Ka4oXX8teLg== X-Google-Smtp-Source: ABdhPJyrFm2IJE+dW3RmSSuvxilQRcnMe1Nv2aAQ0ti216Z6KJ523ZMQHOLSTEVhi8tpXM9IHVtFjQ== X-Received: by 2002:adf:f3cc:: with SMTP id g12mr2369257wrp.412.1597405223679; Fri, 14 Aug 2020 04:40:23 -0700 (PDT) Received: from dell.default ([95.149.164.62]) by smtp.gmail.com with ESMTPSA id 32sm16409129wrh.18.2020.08.14.04.40.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 04:40:23 -0700 (PDT) From: Lee Jones To: davem@davemloft.net, kuba@kernel.org Cc: linux-kernel@vger.kernel.org, Lee Jones , netdev@vger.kernel.org Subject: [PATCH 28/30] net: fddi: skfp: cfm: Remove set but unused variable 'oldstate' Date: Fri, 14 Aug 2020 12:39:31 +0100 Message-Id: <20200814113933.1903438-29-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200814113933.1903438-1-lee.jones@linaro.org> References: <20200814113933.1903438-1-lee.jones@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While we're at it, remove some code which has never been invoked. Keep the comment though, as it seems potentially half useful. Fixes the following W=1 kernel build warning(s): drivers/net/fddi/skfp/cfm.c: In function ‘cfm’: drivers/net/fddi/skfp/cfm.c:211:6: warning: variable ‘oldstate’ set but not used [-Wunused-but-set-variable] Cc: "David S. Miller" Cc: Jakub Kicinski Cc: netdev@vger.kernel.org Signed-off-by: Lee Jones --- drivers/net/fddi/skfp/cfm.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/net/fddi/skfp/cfm.c b/drivers/net/fddi/skfp/cfm.c index e9bf42996de83..668b1d7be6e23 100644 --- a/drivers/net/fddi/skfp/cfm.c +++ b/drivers/net/fddi/skfp/cfm.c @@ -208,7 +208,6 @@ void cfm(struct s_smc *smc, int event) { int state ; /* remember last state */ int cond ; - int oldstate ; /* We will do the following: */ /* - compute the variable WC_Flag for every port (This is where */ @@ -222,7 +221,6 @@ void cfm(struct s_smc *smc, int event) /* - change the portstates */ cem_priv_state (smc, event); - oldstate = smc->mib.fddiSMTCF_State ; do { DB_CFM("CFM : state %s%s event %s", smc->mib.fddiSMTCF_State & AFLAG ? "ACTIONS " : "", @@ -250,18 +248,11 @@ void cfm(struct s_smc *smc, int event) if (cond != smc->mib.fddiSMTPeerWrapFlag) smt_srf_event(smc,SMT_COND_SMT_PEER_WRAP,0,cond) ; -#if 0 /* - * Don't send ever MAC_PATH_CHANGE events. Our MAC is hard-wired + * Don't ever send MAC_PATH_CHANGE events. Our MAC is hard-wired * to the primary path. */ - /* - * path change - */ - if (smc->mib.fddiSMTCF_State != oldstate) { - smt_srf_event(smc,SMT_EVENT_MAC_PATH_CHANGE,INDEX_MAC,0) ; - } -#endif + #endif /* no SLIM_SMT */ /* -- 2.25.1