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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DC4AC433FE for ; Tue, 8 Feb 2022 13:44:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243035AbiBHNoH (ORCPT ); Tue, 8 Feb 2022 08:44:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235437AbiBHNoG (ORCPT ); Tue, 8 Feb 2022 08:44:06 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A8ADC03FECE for ; Tue, 8 Feb 2022 05:44:06 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id p24so14654814ejo.1 for ; Tue, 08 Feb 2022 05:44:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=51cyXGs5PH+g5ThyWMgVbLD2cGGTIvqxnKH25hFuBb8=; b=dnKA4ttigybSoGmFE5QTpV/NodfdbUjvio9yre6Q7/jRscPVTDhw+VyhcV43LT0LJk m7Ur8ot/9c6SGUpF8jEFoOrhkNgC542ieS9RQraOZaedlYtylnA/AoRv8juxOICPEePM OuSHrm33PXwYI4lQFZNAbDp7cqoiuXnUH+Zpw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=51cyXGs5PH+g5ThyWMgVbLD2cGGTIvqxnKH25hFuBb8=; b=d7MAcdXR/PXo7n9WP4GogvTrT3HXLjMxowvs6/LSAa7yexIr5s7+DQq4YV8Je9x4h4 GcqNeRVnrZuLcfij+g2kDhlIgPSJRqTVArDnOZVQ/NboMUDBs6NxnKEvM7U9kkoauVNb nYg/jR4RZJzZlDSPRI/Ii7DVU6xNjOornP5KJjFHNQ7KjwEu7pJQEYis5EufVupXETBy Xy+lGMi8VVz5JmEXPHtUsLiovUfE1RMBBnSVOLBRO0S7ouqGNWZidAQllLZVL4egg2jR mSKi/Jy1E65T1nmo92243h+O/l1vKBomJyhApqbK+qSXRwQr6jZZKlPLEnIrNn71GIQo Cvgg== X-Gm-Message-State: AOAM5311MfdmZUHWSppFBFHdjCELHJ75AThWXyFUK2f9/cLqb+1zywHK i9PFZXuBuP2UpcP9hWf1iz22vA== X-Google-Smtp-Source: ABdhPJxTQwtA5OAxy4GhkNWeqT5PXXuFesodGdl/FW7m9+zEt3PNiJe70Xg3mcWPGa2NuZyu11gHMQ== X-Received: by 2002:a17:907:7388:: with SMTP id er8mr3693063ejc.269.1644327844707; Tue, 08 Feb 2022 05:44:04 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id hh13sm4828699ejb.89.2022.02.08.05.44.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 05:44:04 -0800 (PST) Date: Tue, 8 Feb 2022 14:44:02 +0100 From: Daniel Vetter To: Helge Deller Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter Subject: Re: [PATCH] fbcon: Avoid 'cap' set but not used warning Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 5.10.0-8-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org On Mon, Feb 07, 2022 at 04:59:31PM +0100, Helge Deller wrote: > Fix this kernel test robot warning: > > drivers/video/fbdev/core/fbcon.c: In function 'fbcon_init': > drivers/video/fbdev/core/fbcon.c:1028:6: warning: variable 'cap' set but not used [-Wunused-but-set-variable] > > The cap variable is only used when CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION > is enabled. Drop the temporary variable and use info->flags instead. > > Fixes: 87ab9f6b7417 ("Revert "fbcon: Disable accelerated scrolling") > Reported-by: kernel test robot > Signed-off-by: Helge Deller Applied to drm-misc-fixes. btw I think would still make sense to grab drm-misc commit rights for you, so you can push stuff like this directly. Thanks, Daniel > > diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c > index f36829eeb5a9..2fc1b80a26ad 100644 > --- a/drivers/video/fbdev/core/fbcon.c > +++ b/drivers/video/fbdev/core/fbcon.c > @@ -1025,7 +1025,7 @@ static void fbcon_init(struct vc_data *vc, int init) > struct vc_data *svc = *default_mode; > struct fbcon_display *t, *p = &fb_display[vc->vc_num]; > int logo = 1, new_rows, new_cols, rows, cols; > - int cap, ret; > + int ret; > > if (WARN_ON(info_idx == -1)) > return; > @@ -1034,7 +1034,6 @@ static void fbcon_init(struct vc_data *vc, int init) > con2fb_map[vc->vc_num] = info_idx; > > info = registered_fb[con2fb_map[vc->vc_num]]; > - cap = info->flags; > > if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET) > logo_shown = FBCON_LOGO_DONTSHOW; > @@ -1137,8 +1136,8 @@ static void fbcon_init(struct vc_data *vc, int init) > ops->graphics = 0; > > #ifdef CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION > - if ((cap & FBINFO_HWACCEL_COPYAREA) && > - !(cap & FBINFO_HWACCEL_DISABLED)) > + if ((info->flags & FBINFO_HWACCEL_COPYAREA) && > + !(info->flags & FBINFO_HWACCEL_DISABLED)) > p->scrollmode = SCROLL_MOVE; > else /* default to something safe */ > p->scrollmode = SCROLL_REDRAW; -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch