From patchwork Fri Nov 27 19:58:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11937161 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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 B8346C3E8C5 for ; Fri, 27 Nov 2020 19:59:08 +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 68EF021527 for ; Fri, 27 Nov 2020 19:59:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="doK4lBFv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 68EF021527 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.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 E2BFD6F3D1; Fri, 27 Nov 2020 19:59:07 +0000 (UTC) Received: from mail-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) by gabe.freedesktop.org (Postfix) with ESMTPS id F0D8C6F3CB for ; Fri, 27 Nov 2020 19:59:01 +0000 (UTC) Received: by mail-lf1-x142.google.com with SMTP id s27so8559806lfp.5 for ; Fri, 27 Nov 2020 11:59:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tAy2L6+yHjKuwgbD1GtBSbwZUtZR3+FgaFh+jK71xjw=; b=doK4lBFvnmTZcgYL/PjjUuQB8ZoUk+PEo0qU+uLpJMsr2En+IwyOb047noqpqiE4E7 ns0ENbBkflLflMCTngF9seeipp8CMx1/WoAsTEf3iihARCetdENCniJzzfGCZplRbTtO UhusRpw2RGQLTMQ6zQuwpyeGjMzQz8ujlGRIKZJUiPT4+fRc8pQOWenhI6DaMxh3fTbM LPN+7GLLpoK+QEDfotRTyJ926oA0If7zdHpHKjTZXY3GKaDo3G8cfFpeRQQQmTQAZaZo OJUHeRPgDRH4JFWSYvBdCxT3x5oX5bfIRaMQJCUGx1Goh9AVJhbvcsTWq7YpDC6CW3iv b8gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tAy2L6+yHjKuwgbD1GtBSbwZUtZR3+FgaFh+jK71xjw=; b=tSIKjFL4kGCGhG5SilQpyW5TTCJAciOW25N1K12HEpVHk59vJrKRgBAwyP2CvNY5Rx qCHbLWfNMIrUdcBPiuXorKWP6lD+LrRY3IbWLkIzvJX0Ts3EV2N7KCOY3Uc1la7qwQfV W/9/OlvZQZenoa9YIDJ51PDX/MS2vCpEusllTgG0bNQj+w+KIfF0qmpVewIKqFwQGDjH t9XWVMhm5IgBLeQxx1EC+ozGITR7j+BNMMVq4T9HaD1Qft4z7tNGxNIjTnUPcEyT47YJ 8lbV2iJe6jldrPyzHU8rnrMsQD65pO2iFlGXrM6rT1pCAdQrG5DaZkkNsYGaXut3cwxF p4gA== X-Gm-Message-State: AOAM530+OyqkffH6v5tnIHpraXQ9d0GmMhXlohKOnFZHScdz7xv0Hx3g 1GXJM/jM5tpLzkAU37+UnLc= X-Google-Smtp-Source: ABdhPJzA9tlt5/v8JE6nDmhPGEGXRsyRJmv4B2nwWuL72K6hMPQ+4HMvJ4sQQ3zrl6l0SjVCnZ1fkg== X-Received: by 2002:a19:ec07:: with SMTP id b7mr4326715lfa.114.1606507140403; Fri, 27 Nov 2020 11:59:00 -0800 (PST) Received: from saturn.localdomain ([2a00:fd00:8060:1c00:9d62:990:4557:451]) by smtp.gmail.com with ESMTPSA id c6sm1070415ljj.140.2020.11.27.11.58.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 11:58:59 -0800 (PST) From: Sam Ravnborg To: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Lee Jones Subject: [PATCH v1 10/28] video: fbdev: sis: Fix W=1 warnings in sis_main Date: Fri, 27 Nov 2020 20:58:07 +0100 Message-Id: <20201127195825.858960-11-sam@ravnborg.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201127195825.858960-1-sam@ravnborg.org> References: <20201127195825.858960-1-sam@ravnborg.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: Vaibhav Gupta , Tetsuo Handa , Peter Rosin , Michal Januszewski , Laurent Pinchart , linux-nvidia@lists.surfsouth.com, Jiri Slaby , Arnd Bergmann , Florian Tobias Schandinat , Evgeny Novikov , Sam Ravnborg , Saeed Mirzamohammadi , Daniel Vetter , Thomas Winischhofer , Thomas Zimemrmann , Bartlomiej Zolnierkiewicz , Jani Nikula , Aditya Pakki , Xiaofei Tan , Nathan Chancellor , Alex Dewar , Jason Yan , Greg Kroah-Hartman , Qilong Zhang , Randy Dunlap , Gustavo Silva , Ferenc Bakonyi , George Kennedy , Kristoffer Ericson , Alexander Klimov , Jingoo Han , Joe Perches , Peilin Ye , Mike Rapoport Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fix W=1 warning by dropping unused variable Signed-off-by: Sam Ravnborg Cc: Thomas Winischhofer --- drivers/video/fbdev/sis/sis_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/sis/sis_main.c b/drivers/video/fbdev/sis/sis_main.c index 03c736f6f3d0..266a5582f94d 100644 --- a/drivers/video/fbdev/sis/sis_main.c +++ b/drivers/video/fbdev/sis/sis_main.c @@ -5029,7 +5029,6 @@ static void sisfb_post_xgi_ddr2(struct sis_video_info *ivideo, u8 regb) static const u8 cs168[8] = { 0x48, 0x78, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00 }; - u8 reg; u8 v1; u8 v2; u8 v3; @@ -5037,9 +5036,9 @@ static void sisfb_post_xgi_ddr2(struct sis_video_info *ivideo, u8 regb) SiS_SetReg(SISCR, 0xb0, 0x80); /* DDR2 dual frequency mode */ SiS_SetReg(SISCR, 0x82, 0x77); SiS_SetReg(SISCR, 0x86, 0x00); - reg = SiS_GetReg(SISCR, 0x86); + SiS_GetReg(SISCR, 0x86); SiS_SetReg(SISCR, 0x86, 0x88); - reg = SiS_GetReg(SISCR, 0x86); + SiS_GetReg(SISCR, 0x86); v1 = cs168[regb]; v2 = cs160[regb]; v3 = cs158[regb]; if (ivideo->haveXGIROM) { v1 = bios[regb + 0x168]; @@ -5049,9 +5048,9 @@ static void sisfb_post_xgi_ddr2(struct sis_video_info *ivideo, u8 regb) SiS_SetReg(SISCR, 0x86, v1); SiS_SetReg(SISCR, 0x82, 0x77); SiS_SetReg(SISCR, 0x85, 0x00); - reg = SiS_GetReg(SISCR, 0x85); + SiS_GetReg(SISCR, 0x85); SiS_SetReg(SISCR, 0x85, 0x88); - reg = SiS_GetReg(SISCR, 0x85); + SiS_GetReg(SISCR, 0x85); SiS_SetReg(SISCR, 0x85, v2); SiS_SetReg(SISCR, 0x82, v3); SiS_SetReg(SISCR, 0x98, 0x01);