From patchwork Mon Apr 6 13:06:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1266874 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BzyTWOEt; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48wrRc6YcNz9sRf for ; Mon, 6 Apr 2020 23:07:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CBC0081940; Mon, 6 Apr 2020 15:07:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BzyTWOEt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8CB8B8163D; Mon, 6 Apr 2020 15:07:10 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EF5CD8163D for ; Mon, 6 Apr 2020 15:07:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pf1-x443.google.com with SMTP id c20so7485846pfi.7 for ; Mon, 06 Apr 2020 06:07:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=qhEc4wwAM3xCWA5UaTJyGYEIpFgz65ZYLVKC/WRucUM=; b=BzyTWOEt+Rs7rujDLYs+HX38/vtidf3UEIGxRWC62iVYyqLQU2d5GvecdSO+eVYxI5 qsOhYl4deH3Gr+42KnYGKlL1kAPgwad9jSNNbO6JBE3iH271jCaLi5WoJnHhh0uFGBWl wev1eJQN1+JqjB3BNdAN1VeqgzCc3npDPx4+kxWxxxz1JExCXbt6esmP6Ed9M7w86JWg Cftg+WNPnsoY26M1mdfW2prIb5w98uRcotP+myjFuyjEFjmnrhKa3HdRdBGjA+hmEHC8 /oj0jl4HFpQ6ZD8BYYd8CiiFxI1VrqTvPHJtPKaVdycax2qVAbP+XkW3AMRIXVqA3q5t DqAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=qhEc4wwAM3xCWA5UaTJyGYEIpFgz65ZYLVKC/WRucUM=; b=NwEXEggyAqXxHyoITBcqkPXDY0Wl4gCHVA4vxZYwYhe2Dpe1jeF8jBINQU2rpcikk7 OJFc0SpXNHFbz7jlV2FTO7M5hxzs1OPBDq2Z7bZyEoojZCdNeVXksbctYSk82T7t4+UL t3366IPN9rEd5sWVNk3SEbKIFWL/y75rWy+xhf7xYn1hQXHgk/K9lCfh5xtKlq7v5oxa EpGnuFDr/5GOqztTOqLuN7N+4/yZEmXokmW3LUDTfmra39woZil/YZ0KqLIIW2pgZ50c kb3Pm8Rh1m9UghdZDLKkYMLHP14Xuynjz6WVedV8L+FvKlDZbNsD2zSbYDU0vnS5raUT lnkA== X-Gm-Message-State: AGi0PuaAFBgjtB9jBXlWAz+DBWDhcd7HOiku20t3TDuK75EJHJVFBIRB P2jFlYZJi5f6TOh0jcRma3g= X-Google-Smtp-Source: APiQypLwLRHDFHUjJfqlaOIJbIMCuLxMYFZMwBsA+68Ithwm4/qE0XvtCDLFC32kIZlrxz7jCyp03Q== X-Received: by 2002:a62:e107:: with SMTP id q7mr21196182pfh.190.1586178425586; Mon, 06 Apr 2020 06:07:05 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id n7sm10892410pgm.28.2020.04.06.06.07.05 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 06 Apr 2020 06:07:05 -0700 (PDT) From: Bin Meng To: Tom Rini , U-Boot Mailing List Subject: [PATCH v2 1/3] video: sunxi: Change sunxi_get_mon_desc() to not return NULL for the default case Date: Mon, 6 Apr 2020 06:06:58 -0700 Message-Id: <1586178420-31046-2-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1586178420-31046-1-git-send-email-bmeng.cn@gmail.com> References: <1586178420-31046-1-git-send-email-bmeng.cn@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean When building with gcc 9.2.0, the following build warning was seen: drivers/video/sunxi/sunxi_display.c: In function 'video_hw_init': drivers/video/sunxi/sunxi_display.c:1217:2: error: '%s' directive argument is null [-Werror=format-overflow=] Change sunxi_get_mon_desc() to not return NULL for the default case, to fix the compiler warning. Signed-off-by: Bin Meng Reviewed-by: Tom Rini --- Changes in v2: - catch sunxi_monitor_none in the default case and use "none" there drivers/video/sunxi/sunxi_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c index 31f0aa7..4e1720e 100644 --- a/drivers/video/sunxi/sunxi_display.c +++ b/drivers/video/sunxi/sunxi_display.c @@ -1014,7 +1014,6 @@ static void sunxi_mode_set(const struct ctfb_res_modes *mode, static const char *sunxi_get_mon_desc(enum sunxi_monitor monitor) { switch (monitor) { - case sunxi_monitor_none: return "none"; case sunxi_monitor_dvi: return "dvi"; case sunxi_monitor_hdmi: return "hdmi"; case sunxi_monitor_lcd: return "lcd"; @@ -1023,8 +1022,9 @@ static const char *sunxi_get_mon_desc(enum sunxi_monitor monitor) case sunxi_monitor_composite_ntsc: return "composite-ntsc"; case sunxi_monitor_composite_pal_m: return "composite-pal-m"; case sunxi_monitor_composite_pal_nc: return "composite-pal-nc"; + case sunxi_monitor_none: /* fall through */ + default: return "none"; } - return NULL; /* never reached */ } ulong board_get_usable_ram_top(ulong total_size)