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: 12017017 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 9A747C4332D for ; Wed, 13 Jan 2021 14:51:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 65D76235FF for ; Wed, 13 Jan 2021 14:51:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727513AbhAMOvx (ORCPT ); Wed, 13 Jan 2021 09:51:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727479AbhAMOvv (ORCPT ); Wed, 13 Jan 2021 09:51:51 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 954EFC061388 for ; Wed, 13 Jan 2021 06:50:37 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id g25so3769827wmh.1 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=nHa3V5bl69CUbVj4BOb7kz4wKSuE0g8F+6n1Sva3ifHhtooi37k9e211vIATHpHfs8 nEXBSJd4UyqDz1gk71gMWXrfQG9HTxHNwKNqFW8YTLRsqexOoLQTTNgSsm0GU5VO7IGH jkLJzjdttTwBoazjh8+s6PbxPZJhbqAIhMVT8pezkV08NEAkORKi/y9jFigeYbrdEEjK 9I6Y542lWpFenoTdk6SncLPhe/6X4FiD1grdFHj3pbhmWXVr+0BBeiuCpmu7boDp1NCh Jxsq4B8iHLihPcmnz7R7rixL02SjICby6u3Wgg2AVhUWOKiUDe5p64Bpa1cjZYlwDFjG pwTg== X-Gm-Message-State: AOAM533wPgsRYiyr4WR75KUi0pPJl7tsKXraPHAEqt4hAPdpTjn0S0FJ 2uTJNWCWIG2Ge18OpM9urD92Pw== X-Google-Smtp-Source: ABdhPJy4RotZ5wPboUC1kdYhrUWx9GlS9eDgIJqXfbaNL8FlpjQa2No/+N3798NUVzIh33Csn1WwcA== 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 Cc: linux-kernel@vger.kernel.org, daniel.mantione@freepascal.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.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 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org 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) {