From patchwork Wed Feb 12 17:23:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1236965 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=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=P+0v+FmJ; 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 48Hmhn3PL7z9sPK for ; Thu, 13 Feb 2020 04:24:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9AAEA811F9; Wed, 12 Feb 2020 18:24:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="P+0v+FmJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 240C5811FB; Wed, 12 Feb 2020 18:24:04 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5F525811F3 for ; Wed, 12 Feb 2020 18:24:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1581528235; bh=lrT9D13x1X4CB4wGg0ACo13iPOR6tUrqsYFjhxtb4ys=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=P+0v+FmJgrxF375u6y8Bn1kBSOVQjAEf7xhoc+m3zF+ePUX/H3D12xyCvv0bnsqhy X3+gHwCdf3b9do5bQo/BdkgHdJM6MvRCzMMCeHEt77BA+b5FbA0PQ6SLu1gmXF2gHv AMBAuU2lTKxoCF3m+1THfbJi1NLgBFJadx0x14lg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([84.119.33.160]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M7sDq-1j6rgu3Hj0-0052ej; Wed, 12 Feb 2020 18:23:54 +0100 From: Heinrich Schuchardt To: Tom Rini Cc: Simon Glass , Patrice Chotard , Patrick Delaunay , Joe Hershberger , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH v2 1/1] common/console.c: discard volatile Date: Wed, 12 Feb 2020 18:23:49 +0100 Message-Id: <20200212172349.19267-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:wTWCtiWGe/1xT8paSdkt9Wnkgt6DQjYNL4j4sms/fO3IMsNg3SW cWIPXbGyIVHvGIHjfxCDpTO4wB2bh1aPnEilo+KdeQXxBh7DegPUfw7LiBkI7jo81vDfn40 eLtQOq6iag97c8LjIh85iC2mLiRj3KU0Bb9zgYIh8l4jCYCXEo75ZI5VXo80MVayQWY2lxJ 6nxMt3BxfXfNT04Paa+TQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:kfcYLs55uRU=:8DENEffc2ujVD83zpLKiay D5JSMMyN/91wfyISzoB0b8u4WgqGbTZlGlZXmvOnjEgKh3l2/fx7POduzsCBUEZKEgu9L0m6J SHECW/PTm3j47XmtIW0S7XxeruoQZnz5nXfiuys7nT5ancJP+fdi4RyneVY5vsNxiUvm8l597 t4XZyYwUAG585XYiRNuBdlP9f/QCfiHvaCJxg12jAzS4Zgr91x2ubwowziCYRHNA0kuCenAuw V0MLqeZJfspESersFnpBQVykZ83Od+nZcFvg5ecnEFVevfbFeuu2iaCL9dDoaGEPT7owUhiuu vTb55VNjxOGIX12GJ91+Vyj80V4h7fYWsEfB9mnZh0l2E53HA+0Xrz8Uyh3/hXFY1ibXXbN0J 6TFCUuRyfmWXSGvqV03Vq5vls7/DrznlwsNIwIyuvQc96wLj9zePrVsya1mPz6umDb5n/pXoF rr/zcI44cOMDMrWoGFKgICfApnQWPJtM65aEM9wrz8X3dm2mQSHREGtAdX/M9P/5CxVQlMV/d yFi8McHu85EP8UbYCSSEUVaCdO0j8umK7XYcK6yaD+rWZEnN+mjeQkXgB9ik2jwZGWNlJabUq 24+gyWza9cWeHu27eLiUwAkLTTjc/LWPvahcvV6esFJkcTcYxKpSlas5CGDleKT2ML5rhthWo xeDBofDWNb+dQbtbZXlk+VajffxmHdnxbtOPVGwf6wqeymPblJBI5rW2t+MZv1M3/Xl1LrKt3 W632mlKoPOmPgz/HvLQn10frKr34reRAyvCUqiMGcQg08SNGXjEvbKcZvYmBZt56AfcDoJW4N gOglDbSI2UF8HblXhQuaZr6Kj0zBc4JchuFidflzrD1CiqVyQE8pTB4sTfNRJq9id/IiAunHT J+JuOQbd4ZOvB0UMwqjg07M7PXTaVXVVBzDU9ShBMTjsy2V0UoYGDlJRyTVdLpEAYtzpA7B8n EuT+6nkXGYKQy/qG8ua3c3R3D8ZQrj/aw9JDV0qK8JjJyuP20ZfoNjE4wbi8xIX9pJbZlhYd1 vapy/6MoCsnxhZKsFZTRIlzj041IUEDvtE78h0dt46sgviLPdIa3dNBohyGP9lcKPOOdW1d4L qedVzQF9Zq+gvi/8QBRmgxdaDK8Q46YR2GmZLITIrn4F+b4bayQIT670ycpYb+K3wAWyoaMKk XDw8AG1TySE82skl7TRuJvmn6XE/71BdiFrX90aIo4KGsYRsMkpu39YqKdzYZw13ZIQ5gnIPh UFWDKud9+g8pG7t40 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.1 at phobos.denx.de X-Virus-Status: Clean Avoid errors of like common/console.c: In function ‘console_record_reset’: common/console.c:615:16: error: passing argument 1 of ‘membuff_purge’ discards ‘volatile’ qualifier from pointer target type [-Werror=discarded-qualifiers] 615 | membuff_purge(&gd->console_out); | ^~~~~~~~~~~~~~~~ by casting to non-volatile. The volatile property stems from declarations like arch/arm/include/asm/global_data.h:114: But there is no need to treat gd->console_out and gd->console_in as volatile in the context of common/console.c. Fixes: b612312816ff ("console: Add a function to read a line of the output / eof") Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- v2: Fix additional errors introduced by b612312816ff. --- common/console.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) -- 2.25.0 diff --git a/common/console.c b/common/console.c index 7681da19a2..e398530a13 100644 --- a/common/console.c +++ b/common/console.c @@ -401,7 +401,7 @@ int getc(void) if (gd->console_in.start) { int ch; - ch = membuff_getbyte(&gd->console_in); + ch = membuff_getbyte((struct membuff *)&gd->console_in); if (ch != -1) return 1; } @@ -426,7 +426,7 @@ int tstc(void) return 0; #ifdef CONFIG_CONSOLE_RECORD if (gd->console_in.start) { - if (membuff_peekbyte(&gd->console_in) != -1) + if (membuff_peekbyte((struct membuff *)&gd->console_in) != -1) return 1; } #endif @@ -518,7 +518,7 @@ void putc(const char c) return; #ifdef CONFIG_CONSOLE_RECORD if ((gd->flags & GD_FLG_RECORD) && gd->console_out.start) - membuff_putbyte(&gd->console_out, c); + membuff_putbyte((struct membuff *)&gd->console_out, c); #endif #ifdef CONFIG_SILENT_CONSOLE if (gd->flags & GD_FLG_SILENT) { @@ -569,7 +569,7 @@ void puts(const char *s) return; #ifdef CONFIG_CONSOLE_RECORD if ((gd->flags & GD_FLG_RECORD) && gd->console_out.start) - membuff_put(&gd->console_out, s, strlen(s)); + membuff_put((struct membuff *)&gd->console_out, s, strlen(s)); #endif #ifdef CONFIG_SILENT_CONSOLE if (gd->flags & GD_FLG_SILENT) { @@ -602,18 +602,20 @@ int console_record_init(void) { int ret; - ret = membuff_new(&gd->console_out, CONFIG_CONSOLE_RECORD_OUT_SIZE); + ret = membuff_new((struct membuff *)&gd->console_out, + CONFIG_CONSOLE_RECORD_OUT_SIZE); if (ret) return ret; - ret = membuff_new(&gd->console_in, CONFIG_CONSOLE_RECORD_IN_SIZE); + ret = membuff_new((struct membuff *)&gd->console_in, + CONFIG_CONSOLE_RECORD_IN_SIZE); return ret; } void console_record_reset(void) { - membuff_purge(&gd->console_out); - membuff_purge(&gd->console_in); + membuff_purge((struct membuff *)&gd->console_out); + membuff_purge((struct membuff *)&gd->console_in); } void console_record_reset_enable(void) @@ -624,12 +626,13 @@ void console_record_reset_enable(void) int console_record_readline(char *str, int maxlen) { - return membuff_readline(&gd->console_out, str, maxlen, ' '); + return membuff_readline((struct membuff *)&gd->console_out, str, + maxlen, ' '); } int console_record_avail(void) { - return membuff_avail(&gd->console_out); + return membuff_avail((struct membuff *)&gd->console_out); } #endif