From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kV4DZ-0006ES-Fc for mharc-qemu-trivial@gnu.org; Tue, 20 Oct 2020 22:51:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kV4DY-0006De-65 for qemu-trivial@nongnu.org; Tue, 20 Oct 2020 22:51:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:22841) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kV4DW-0003UG-Ap for qemu-trivial@nongnu.org; Tue, 20 Oct 2020 22:51:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603248668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Q7UQ83lvkhz8y4yCGNFKHslN96axvC+cl56JM2KezwA=; b=PruCc6BUIsqzLh7LdK8J2aldCoPXnJ/JtL2lBtgn7h41xDHDmYBWKEIIs9rillJJ40WIW6 WlMJNSY1no2eBBCUPhYUa30a/WHWLIWK2H3If7jOdk5KvCR4RaVj48z0GWX+YCs292+eWG MTKGUNNgIutaC7souxb7ozn0Dgymgoc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-420-PD1Or6FcPBG_lgJb0uad5w-1; Tue, 20 Oct 2020 22:51:06 -0400 X-MC-Unique: PD1Or6FcPBG_lgJb0uad5w-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2883C804036; Wed, 21 Oct 2020 02:51:01 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-182.ams2.redhat.com [10.36.112.182]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D326D1002C0E; Wed, 21 Oct 2020 02:51:00 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5A7641132A08; Wed, 21 Oct 2020 04:50:59 +0200 (CEST) From: Markus Armbruster To: Thomas Huth Cc: qemu-devel@nongnu.org, Peter Maydell , qemu-trivial@nongnu.org, qemu-arm@nongnu.org Subject: Re: [PATCH v2] hw/rtc/twl92230: Silence warnings about missing fallthrough statements References: <20201020105108.19733-1-thuth@redhat.com> Date: Wed, 21 Oct 2020 04:50:59 +0200 In-Reply-To: <20201020105108.19733-1-thuth@redhat.com> (Thomas Huth's message of "Tue, 20 Oct 2020 12:51:08 +0200") Message-ID: <877drks358.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/20 22:12:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Oct 2020 02:51:12 -0000 Thomas Huth writes: > When compiling with -Werror=implicit-fallthrough, gcc complains about > missing fallthrough annotations in this file. Looking at the code, > the fallthrough is indeed wanted here, but instead of adding the > annotations, it can be done more efficiently by simply calculating > the offset with a subtraction instead of increasing a local variable > one by one. > > Reviewed-by: Peter Maydell > Signed-off-by: Thomas Huth > --- > v2: Fixed copy-n-paste bug > > hw/rtc/twl92230.c | 50 +++++++++++++++++++++++------------------------ > 1 file changed, 24 insertions(+), 26 deletions(-) > > diff --git a/hw/rtc/twl92230.c b/hw/rtc/twl92230.c > index f838913b37..50b97a1fce 100644 > --- a/hw/rtc/twl92230.c > +++ b/hw/rtc/twl92230.c > @@ -271,37 +271,36 @@ static void menelaus_gpio_set(void *opaque, int line, int level) > static uint8_t menelaus_read(void *opaque, uint8_t addr) > { > MenelausState *s = (MenelausState *) opaque; > - int reg = 0; > > switch (addr) { > case MENELAUS_REV: > return 0x22; > > - case MENELAUS_VCORE_CTRL5: reg ++; > - case MENELAUS_VCORE_CTRL4: reg ++; > - case MENELAUS_VCORE_CTRL3: reg ++; > - case MENELAUS_VCORE_CTRL2: reg ++; > + case MENELAUS_VCORE_CTRL5: > + case MENELAUS_VCORE_CTRL4: > + case MENELAUS_VCORE_CTRL3: > + case MENELAUS_VCORE_CTRL2: > case MENELAUS_VCORE_CTRL1: > - return s->vcore[reg]; > + return s->vcore[addr - MENELAUS_VCORE_CTRL1]; Suggest to count up instead of down: case MENELAUS_VCORE_CTRL1: + case MENELAUS_VCORE_CTRL2: + case MENELAUS_VCORE_CTRL3: + case MENELAUS_VCORE_CTRL4: + case MENELAUS_VCORE_CTRL5: - return s->vcore[reg]; + return s->vcore[addr - MENELAUS_VCORE_CTRL1]; [...] From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:6b17:0:0:0:0:0 with SMTP id d23csp5320933lfa; Tue, 20 Oct 2020 19:51:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvCTDmGQlcCWqGDbucZVabfoVz8M4fP+oMm9LnCJdyjjw40nx8x67pfgV+lLu2mhh0mEQM X-Received: by 2002:a25:2389:: with SMTP id j131mr1953606ybj.25.1603248684104; Tue, 20 Oct 2020 19:51:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603248684; cv=none; d=google.com; s=arc-20160816; b=of2FWQ29lCwIIsq9XP2NObnEspP79UTz3hx5b28g8UX2PZjkDbSV9juRAg51vgQXk2 xhDDuwDbawzuxss70t55zam4bjJiRXkCFiZf4zoEhW65sA1bo/ZfV6REYJaHXH1Div5V VN+pENmA8IKF1H0X9rnOEV+AQ51ePEt0w4siRApJtyJ0GOGgfJ8dnPi2bGAaLU/2S2Jb BTeAm/acv8MwrnviFCJrVe/1zxtFPRuXACLB9Bg+hHxPGU1jy+VqSg5jF5LDHWVvuHFU aFqf4n7JheaKNMr+vilo3SLq0rbF+gxvpv73ofUfTo6IL1U/LordM8T+SCzBwr0Slam7 lJdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:user-agent :message-id:in-reply-to:date:references:subject:to:from :dkim-signature; bh=Q7UQ83lvkhz8y4yCGNFKHslN96axvC+cl56JM2KezwA=; b=bPt+JFtI+rJrBK6/wcQ2BU/ic1X6DE+El65O4MkAveOmrNh/mfxkKAzkq79lWraa3T /UWWPeLZWn6B4lp9yCZnGZ4XKqWeHyHiIiz2p1rX+PTNlt/VH7UUKZ8Sni44JtKZAMZe /X3EI3quzRv2RlSXJU8IUXSsALIm0cb4RsjTNHNFB5qzfCsQ4m83UPMLDvHAE/TYq7bD vTU2vQsEY0mgqiXduJ1TWVeE3UlDAYsNmy/DkegN4UNVTcffl6nreeu3sou+POw+3MHX BCfMNqATIeYh4GIjGsZBjBqoQGtzU1zZHfgWDmqPO7LF6m0Wo6wx//RWSqv0NZ0gvOYO GHEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=PruCc6BU; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 132si685971ybk.433.2020.10.20.19.51.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Oct 2020 19:51:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=PruCc6BU; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:39204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kV4Dj-0006Dp-Gi for alex.bennee@linaro.org; Tue, 20 Oct 2020 22:51:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kV4DY-0006Dd-6E for qemu-arm@nongnu.org; Tue, 20 Oct 2020 22:51:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30376) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kV4DW-0003UH-6O for qemu-arm@nongnu.org; Tue, 20 Oct 2020 22:51:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603248668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Q7UQ83lvkhz8y4yCGNFKHslN96axvC+cl56JM2KezwA=; b=PruCc6BUIsqzLh7LdK8J2aldCoPXnJ/JtL2lBtgn7h41xDHDmYBWKEIIs9rillJJ40WIW6 WlMJNSY1no2eBBCUPhYUa30a/WHWLIWK2H3If7jOdk5KvCR4RaVj48z0GWX+YCs292+eWG MTKGUNNgIutaC7souxb7ozn0Dgymgoc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-420-PD1Or6FcPBG_lgJb0uad5w-1; Tue, 20 Oct 2020 22:51:06 -0400 X-MC-Unique: PD1Or6FcPBG_lgJb0uad5w-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2883C804036; Wed, 21 Oct 2020 02:51:01 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-182.ams2.redhat.com [10.36.112.182]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D326D1002C0E; Wed, 21 Oct 2020 02:51:00 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5A7641132A08; Wed, 21 Oct 2020 04:50:59 +0200 (CEST) From: Markus Armbruster To: Thomas Huth Subject: Re: [PATCH v2] hw/rtc/twl92230: Silence warnings about missing fallthrough statements References: <20201020105108.19733-1-thuth@redhat.com> Date: Wed, 21 Oct 2020 04:50:59 +0200 In-Reply-To: <20201020105108.19733-1-thuth@redhat.com> (Thomas Huth's message of "Tue, 20 Oct 2020 12:51:08 +0200") Message-ID: <877drks358.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/20 22:12:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Peter Maydell , qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: lQ5S4X3MDnnl Thomas Huth writes: > When compiling with -Werror=implicit-fallthrough, gcc complains about > missing fallthrough annotations in this file. Looking at the code, > the fallthrough is indeed wanted here, but instead of adding the > annotations, it can be done more efficiently by simply calculating > the offset with a subtraction instead of increasing a local variable > one by one. > > Reviewed-by: Peter Maydell > Signed-off-by: Thomas Huth > --- > v2: Fixed copy-n-paste bug > > hw/rtc/twl92230.c | 50 +++++++++++++++++++++++------------------------ > 1 file changed, 24 insertions(+), 26 deletions(-) > > diff --git a/hw/rtc/twl92230.c b/hw/rtc/twl92230.c > index f838913b37..50b97a1fce 100644 > --- a/hw/rtc/twl92230.c > +++ b/hw/rtc/twl92230.c > @@ -271,37 +271,36 @@ static void menelaus_gpio_set(void *opaque, int line, int level) > static uint8_t menelaus_read(void *opaque, uint8_t addr) > { > MenelausState *s = (MenelausState *) opaque; > - int reg = 0; > > switch (addr) { > case MENELAUS_REV: > return 0x22; > > - case MENELAUS_VCORE_CTRL5: reg ++; > - case MENELAUS_VCORE_CTRL4: reg ++; > - case MENELAUS_VCORE_CTRL3: reg ++; > - case MENELAUS_VCORE_CTRL2: reg ++; > + case MENELAUS_VCORE_CTRL5: > + case MENELAUS_VCORE_CTRL4: > + case MENELAUS_VCORE_CTRL3: > + case MENELAUS_VCORE_CTRL2: > case MENELAUS_VCORE_CTRL1: > - return s->vcore[reg]; > + return s->vcore[addr - MENELAUS_VCORE_CTRL1]; Suggest to count up instead of down: case MENELAUS_VCORE_CTRL1: + case MENELAUS_VCORE_CTRL2: + case MENELAUS_VCORE_CTRL3: + case MENELAUS_VCORE_CTRL4: + case MENELAUS_VCORE_CTRL5: - return s->vcore[reg]; + return s->vcore[addr - MENELAUS_VCORE_CTRL1]; [...]