From patchwork Thu Nov 12 19:00:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11901083 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=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 D1B37C55ABD for ; Thu, 12 Nov 2020 19:00:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 3EE872224C for ; Thu, 12 Nov 2020 19:00:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="bgWa0+Br" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3EE872224C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B8D226E323; Thu, 12 Nov 2020 19:00:47 +0000 (UTC) Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id A59F76E323 for ; Thu, 12 Nov 2020 19:00:46 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id p1so7125095wrf.12 for ; Thu, 12 Nov 2020 11:00:46 -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=zw4/3H58DclPUryUYajc25e3NyANX/uApXUC9a6irt8=; b=bgWa0+Br46K2f9cJcIoWiHatx+XZjXt4+HVAL0qFLplwDys63qQgg/LK5a21NfQA9L 8EAXKlgh7nQTW1R6FD75ZYHnq+8lTfi4DGRZOb5hdMaVAYkTaJjlHCq0BLmMKRR7TpNi bMnmV9WWrZ5QkUV2JGlo2bCMHfEKU2jQbtRCQwzwkBh1Czg55uoMo3Wtf03L8QeFwL6u Hy8qH5DZrhrRvRC24d68W5iNxZYnREggOEp30K/dHyOd1CHMrsR999bt1rHU5mPMNqJY SSH69rINO6PADc5ZiszGLW5qNqlHrE+8zjyzXAEVUHz479E1gjQtFaQqlYkxy3lNI6Xx SXUg== 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=zw4/3H58DclPUryUYajc25e3NyANX/uApXUC9a6irt8=; b=psM5Nb+rmGrRJ4RIVswoLhaAjxaxwuVggdYBhpfZDv9/vESc+JJ/nQhYht53zl++AN kTXikF9uMBSHIMTyWBCLvMLWSsyNgZN8cOwczvyvqlK9ITntwbzZZIPNfQuGMDC6uKIx bWVnWcbOQo8CCaP8XsBK+OTvzohBaF0yqiJ7FMEPlP+fr1MqNe+dDxNQND1uHXqaF/W6 YhP5E5sKIJjJM82UgQMhModWtedXOJvUD6ygphtdrm5HDnH6XZAN+HlqTzG+CY2XMSsT sYvKzCAUh/AOJ84xlh3TXUklf4AqTSrpFTbqr8qiV63pifo02EgA3mV8gKCMji//tmCl reVA== X-Gm-Message-State: AOAM532SOWCeOG/kvdZiP2DymfvFz+6Bg032rIFD3ul/YpS9ml2Frhyq lQ2nB68eV+QYZdQT7OLkdT0+M9GirlnTHx2m X-Google-Smtp-Source: ABdhPJxxwFYZtMQX5DH7hJKIUrjEBbmXGyRjjXYs/MLIPQVaWJDaZogWWz8Cc5Qz/4L83VgvX/sopg== X-Received: by 2002:adf:f90f:: with SMTP id b15mr1062991wrr.343.1605207645290; Thu, 12 Nov 2020 11:00:45 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id p4sm8105214wrm.51.2020.11.12.11.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 11:00:44 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 01/30] drm/savage/savage_bci: Remove set but never used 'aper_rsrc' and 'fb_rsrc' Date: Thu, 12 Nov 2020 19:00:10 +0000 Message-Id: <20201112190039.2785914-2-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112190039.2785914-1-lee.jones@linaro.org> References: <20201112190039.2785914-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: David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The comment about them (also removed) says: /* fb_rsrc and aper_rsrc aren't really used currently, but still exist * in case we decide we need information on the BAR for BSD in the * future. */ Well that was written 12 years ago in 2008. We are now in the future and they are still superfluous. We can always add them again at a later date if they are ever required. Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/savage/savage_bci.c: In function ‘savage_driver_firstopen’: drivers/gpu/drm/savage/savage_bci.c:580:24: warning: variable ‘aper_rsrc’ set but not used [-Wunused-but-set-variable] drivers/gpu/drm/savage/savage_bci.c:580:15: warning: variable ‘fb_rsrc’ set but not used [-Wunused-but-set-variable] Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/savage/savage_bci.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c index 6889d6534ebab..606e5b807a6e7 100644 --- a/drivers/gpu/drm/savage/savage_bci.c +++ b/drivers/gpu/drm/savage/savage_bci.c @@ -573,19 +573,12 @@ int savage_driver_firstopen(struct drm_device *dev) { drm_savage_private_t *dev_priv = dev->dev_private; unsigned long mmio_base, fb_base, fb_size, aperture_base; - /* fb_rsrc and aper_rsrc aren't really used currently, but still exist - * in case we decide we need information on the BAR for BSD in the - * future. - */ - unsigned int fb_rsrc, aper_rsrc; int ret = 0; if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) { - fb_rsrc = 0; fb_base = pci_resource_start(dev->pdev, 0); fb_size = SAVAGE_FB_SIZE_S3; mmio_base = fb_base + SAVAGE_FB_SIZE_S3; - aper_rsrc = 0; aperture_base = fb_base + SAVAGE_APERTURE_OFFSET; /* this should always be true */ if (pci_resource_len(dev->pdev, 0) == 0x08000000) { @@ -607,10 +600,8 @@ int savage_driver_firstopen(struct drm_device *dev) } else if (dev_priv->chipset != S3_SUPERSAVAGE && dev_priv->chipset != S3_SAVAGE2000) { mmio_base = pci_resource_start(dev->pdev, 0); - fb_rsrc = 1; fb_base = pci_resource_start(dev->pdev, 1); fb_size = SAVAGE_FB_SIZE_S4; - aper_rsrc = 1; aperture_base = fb_base + SAVAGE_APERTURE_OFFSET; /* this should always be true */ if (pci_resource_len(dev->pdev, 1) == 0x08000000) { @@ -626,10 +617,8 @@ int savage_driver_firstopen(struct drm_device *dev) } } else { mmio_base = pci_resource_start(dev->pdev, 0); - fb_rsrc = 1; fb_base = pci_resource_start(dev->pdev, 1); fb_size = pci_resource_len(dev->pdev, 1); - aper_rsrc = 2; aperture_base = pci_resource_start(dev->pdev, 2); /* Automatic MTRR setup will do the right thing. */ }