From patchwork Wed Jan 13 14:49:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 362124 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp598116jap; Wed, 13 Jan 2021 06:50:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJyx+P5W1hlYx6NOOI7fw7TzXK/kYMFzPXhxm+xezcOwaO78g6VdW4AyWc8vyHPkVQWONpoQ X-Received: by 2002:a63:b66:: with SMTP id a38mr2354778pgl.331.1610549445743; Wed, 13 Jan 2021 06:50:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610549445; cv=none; d=google.com; s=arc-20160816; b=dmDnBaONOdZs72Oq7io8ZBKxNUvbnbQEjnQb1G6wUF7DKPnNSnTQVf/oiYwTtLoopl 7ZKP0PE4PelIJIA5vkCvzANZcPfDCogq6nf6FLreKJV1e5fZkNq8UAzB4CKQ1PtzJy5x oeqtZexw0QRSythfsGocDowi3ZdWQdtlCnQKXyqh9SYUXy087q7IcFTxuEWciumTQQY7 LiOphEEBk+Qhi6I91efXw31eRVIi7+ZAsVKvLpyPogPinFShNUs5v1xoFvyMMMrnkfrF 1bZ9PCxoGEeFIJRaydjAF+CTkpqfPWw0b/iFRUZxThDGVIRhfycFKWn3UMOo1kPaqDaH 4JAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=m4yNBoLl3WNYHTm9PkdMWPF1Y9zS49kCruZXpSMN1uo=; b=JFHGRSG7HGls4mmZpgtYJRBbubLsb8NOeTAnHLDlr2pX4bFeW9/x9+ltAS40tbZ11b UAt16ti0NEvGwCLCTR8weLLLQptYE7QbawHJbM2MBek1lNHLKaZyUOv1dtiMAo+jtpO3 CTJ78Qt+l6Xw1wNQ/CnriFBNTRqDF6j3unCLlWMKi6w4XTmnMoxPN/136zV4/wtZtDjd /zIPOSNMi592Tv+3Wy1Mc6geXLaH1ZP8KuGZVKkyvjLGUvcchuHZPeQLwBgly9l4Utrh C6u3aYhOXCnZODV4F3YD//hGHFdn+dcyFLGfvQLQMnnP+wwbmmdlWaje6PEhvFsvqcHF DErA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=S9AVj327; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id b10si2600400plk.165.2021.01.13.06.50.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jan 2021 06:50:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=S9AVj327; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4832B6EA5C; Wed, 13 Jan 2021 14:50:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by gabe.freedesktop.org (Postfix) with ESMTPS id B4CC36EA5A for ; Wed, 13 Jan 2021 14:50:37 +0000 (UTC) Received: by mail-wm1-x32d.google.com with SMTP id c124so1837426wma.5 for ; Wed, 13 Jan 2021 06:50:37 -0800 (PST) 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=dqYcKMvvBegfm3VenU/QB6olxRoFuHKFr2cjTUmqS/8=; b=S9AVj327o2YowF2UVDBy78wryMVcbl0h9+66FkKjsJ6i8WFxR9bdMBpvD09HQSKrBK vo1ZGwrQgRIbO8nXV14mGFMY7xN/8efJxg72LA+jGfLxFGqANW5Hq1Sp7x03fIgx6wh9 GIQHviMB4xL7Ezvs1yhHlV4tpH+kRDmAfbGsmQRRzOL0kTysvdv5asLys1CLRMxMQw3j KSElJsxQsL2ag8A2zAltelJHGfRZI0Wa5LkJq72Dlg5v5NEk61ys0mgDyU45DAojoCL2 n+AyXgib6ItiEzC+zdVYwT+v/wpNd5HLgmYqxPkzAM1ka3F9mHglqwUXvhnOweZ6cRBz nA+A== 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=dqYcKMvvBegfm3VenU/QB6olxRoFuHKFr2cjTUmqS/8=; b=VBzHgHYj4KezCRJfzW7vYsEV7F4idqeYXjbPcAry5oU+HjXR8Q9NoZXNihNur4aM6B ziF7FaIBgAwsCYdeOa2aTQSK6kZhkElLLAb2/jRgj4VcQAj35C4sasGBWTpG5Q5RsCqp FlcW8Pv00ISwsOrYuuXiB9lVYe5u5xRJDb3CFqUUM2lf088z39QzcGmb13IUShKV76yr zABr4NUbR8o6rZGJX5k8SuWHB2V1+Rp4u7IubnPX/uUS4ZhQPcsHS5JIpGws5+faQwLy j4mk2fB3bvlGsCOBddG62PESoG1FpwKZFLtbWt/0liT+zMqhAYK3uvHragqK3nUmXjpN xEhg== X-Gm-Message-State: AOAM531T9Zk9KMlw/zaelrIkEyzSZbxGJbdDcu+kxXUsFZV3Kxh1lJGi 9T5uC9qNIpeeAvcE5IkWUp7JX2+B9VK4u2Ul X-Received: by 2002:a05:600c:2255:: with SMTP id a21mr2599659wmm.122.1610549436394; Wed, 13 Jan 2021 06:50:36 -0800 (PST) Received: from dell.default ([91.110.221.229]) by smtp.gmail.com with ESMTPSA id t188sm3273433wmf.9.2021.01.13.06.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jan 2021 06:50:35 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 14/31] video: fbdev: aty: mach64_ct: Remove some set but unused variables Date: Wed, 13 Jan 2021 14:49:52 +0000 Message-Id: <20210113145009.1272040-15-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210113145009.1272040-1-lee.jones@linaro.org> References: <20210113145009.1272040-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: daniel.mantione@freepascal.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/video/fbdev/aty/mach64_ct.c: In function ‘aty_init_pll_ct’: drivers/video/fbdev/aty/mach64_ct.c:405:46: warning: variable ‘vga_dsp_on_off’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/aty/mach64_ct.c:405:30: warning: variable ‘vga_dsp_config’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/aty/mach64_ct.c:405:18: warning: variable ‘dsp_on_off’ set but not used [-Wunused-but-set-variable] Cc: daniel.mantione@freepascal.org Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones --- drivers/video/fbdev/aty/mach64_ct.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/video/fbdev/aty/mach64_ct.c b/drivers/video/fbdev/aty/mach64_ct.c index f87cc81f4fa2b..23eececa1e9d7 100644 --- a/drivers/video/fbdev/aty/mach64_ct.c +++ b/drivers/video/fbdev/aty/mach64_ct.c @@ -402,7 +402,7 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll) struct atyfb_par *par = (struct atyfb_par *) info->par; u8 mpost_div, xpost_div, sclk_post_div_real; u32 q, memcntl, trp; - u32 dsp_config, dsp_on_off, vga_dsp_config, vga_dsp_on_off; + u32 dsp_config; #ifdef DEBUG int pllmclk, pllsclk; #endif @@ -488,25 +488,10 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll) /* Allow BIOS to override */ dsp_config = aty_ld_le32(DSP_CONFIG, par); - dsp_on_off = aty_ld_le32(DSP_ON_OFF, par); - vga_dsp_config = aty_ld_le32(VGA_DSP_CONFIG, par); - vga_dsp_on_off = aty_ld_le32(VGA_DSP_ON_OFF, par); if (dsp_config) pll->ct.dsp_loop_latency = (dsp_config & DSP_LOOP_LATENCY) >> 16; -#if 0 - FIXME: is it relevant for us? - if ((!dsp_on_off && !M64_HAS(RESET_3D)) || - ((dsp_on_off == vga_dsp_on_off) && - (!dsp_config || !((dsp_config ^ vga_dsp_config) & DSP_XCLKS_PER_QW)))) { - vga_dsp_on_off &= VGA_DSP_OFF; - vga_dsp_config &= VGA_DSP_XCLKS_PER_QW; - if (ATIDivide(vga_dsp_on_off, vga_dsp_config, 5, 1) > 24) - pll->ct.fifo_size = 32; - else - pll->ct.fifo_size = 24; - } -#endif + /* Exit if the user does not want us to tamper with the clock rates of her chip. */ if (par->mclk_per == 0) {