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 X-Spam-Level: X-Spam-Status: No, score=-13.6 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 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 32D78C433E0 for ; Fri, 22 Jan 2021 14:23:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 D9036230FC for ; Fri, 22 Jan 2021 14:23:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D9036230FC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=lmichel.fr Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2xLc-0000Am-VS for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 09:23:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2xKM-0007ph-7E; Fri, 22 Jan 2021 09:22:18 -0500 Received: from pharaoh.lmichel.fr ([149.202.28.74]:34798) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2xKF-0002rB-34; Fri, 22 Jan 2021 09:22:17 -0500 Received: from localhost (sekoia-pc.home.lmichel.fr [192.168.61.100]) by pharaoh.lmichel.fr (Postfix) with ESMTPSA id 5B35AC602E6; Fri, 22 Jan 2021 15:22:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lmichel.fr; s=pharaoh; t=1611325327; 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=BZr6sDNcCgeUlARkGZE2pYefUM9XfWaCmA93O5S/HHA=; b=G0dK7tmiMpwnrHC8gYBiajH/YnjnyumuiKvWDNUvjnB31N0MQNU1hrLhIJOjDpIa/DWFdY OrAIuq4MBJi0MnXXEq+8Wk3nZx9P1f6Mn8UvdMtTy+V/nUIiUFtMSHuf0jSNdJCYFmj8ii 7HY9TH1lhEvMTHR+1sE2TfF/HJUEwqz5r3Xwb9GLke3diiasVKKK+iJOb8TX9pt/z1CELd NK2rLP6rWzqRc9zI6S8iWIgDWbuHciCkYDpreG32+y10bm65+p4CW3xfUBuLKqeshj7xXI N5uUQ9bkDdq7kEbbX/P/0HJjaoUOgOqKG2FT+yQUQkrE1tT6XMvE09LnjXWmgQ== Date: Fri, 22 Jan 2021 15:22:28 +0100 From: Luc Michel To: Peter Maydell Subject: Re: [PATCH 06/25] hw/timer/cmsdk-apb-timer: Rename CMSDKAPBTIMER struct to CMSDKAPBTimer Message-ID: <20210122142228.v3wnfzz447j5w6nj@sekoia-pc.home.lmichel.fr> References: <20210121190622.22000-1-peter.maydell@linaro.org> <20210121190622.22000-7-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210121190622.22000-7-peter.maydell@linaro.org> Received-SPF: pass client-ip=149.202.28.74; envelope-from=luc@lmichel.fr; helo=pharaoh.lmichel.fr 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Damien Hedde , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 19:06 Thu 21 Jan , Peter Maydell wrote: > The state struct for the CMSDK APB timer device doesn't follow our > usual naming convention of camelcase -- "CMSDK" and "APB" are both > acronyms, but "TIMER" is not so should not be all-uppercase. > Globally rename the struct to "CMSDKAPBTimer" (bringing it into line > with CMSDKAPBWatchdog and CMSDKAPBDualTimer; CMSDKAPBUART remains > as-is because "UART" is an acronym). > > Commit created with: > perl -p -i -e 's/CMSDKAPBTIMER/CMSDKAPBTimer/g' hw/timer/cmsdk-apb-timer.c include/hw/arm/armsse.h include/hw/timer/cmsdk-apb-timer.h > > Signed-off-by: Peter Maydell Reviewed-by: Luc Michel > --- > include/hw/arm/armsse.h | 6 +++--- > include/hw/timer/cmsdk-apb-timer.h | 4 ++-- > hw/timer/cmsdk-apb-timer.c | 28 ++++++++++++++-------------- > 3 files changed, 19 insertions(+), 19 deletions(-) > > diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h > index 77f86771c30..83f5e28c16e 100644 > --- a/include/hw/arm/armsse.h > +++ b/include/hw/arm/armsse.h > @@ -153,9 +153,9 @@ struct ARMSSE { > TZPPC apb_ppc0; > TZPPC apb_ppc1; > TZMPC mpc[IOTS_NUM_MPC]; > - CMSDKAPBTIMER timer0; > - CMSDKAPBTIMER timer1; > - CMSDKAPBTIMER s32ktimer; > + CMSDKAPBTimer timer0; > + CMSDKAPBTimer timer1; > + CMSDKAPBTimer s32ktimer; > qemu_or_irq ppc_irq_orgate; > SplitIRQ sec_resp_splitter; > SplitIRQ ppc_irq_splitter[NUM_PPCS]; > diff --git a/include/hw/timer/cmsdk-apb-timer.h b/include/hw/timer/cmsdk-apb-timer.h > index 0d80b2a48cd..baa009bb2da 100644 > --- a/include/hw/timer/cmsdk-apb-timer.h > +++ b/include/hw/timer/cmsdk-apb-timer.h > @@ -18,9 +18,9 @@ > #include "qom/object.h" > > #define TYPE_CMSDK_APB_TIMER "cmsdk-apb-timer" > -OBJECT_DECLARE_SIMPLE_TYPE(CMSDKAPBTIMER, CMSDK_APB_TIMER) > +OBJECT_DECLARE_SIMPLE_TYPE(CMSDKAPBTimer, CMSDK_APB_TIMER) > > -struct CMSDKAPBTIMER { > +struct CMSDKAPBTimer { > /*< private >*/ > SysBusDevice parent_obj; > > diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c > index f85f1309f37..ae9c5422540 100644 > --- a/hw/timer/cmsdk-apb-timer.c > +++ b/hw/timer/cmsdk-apb-timer.c > @@ -67,14 +67,14 @@ static const int timer_id[] = { > 0x0d, 0xf0, 0x05, 0xb1, /* CID0..CID3 */ > }; > > -static void cmsdk_apb_timer_update(CMSDKAPBTIMER *s) > +static void cmsdk_apb_timer_update(CMSDKAPBTimer *s) > { > qemu_set_irq(s->timerint, !!(s->intstatus & R_INTSTATUS_IRQ_MASK)); > } > > static uint64_t cmsdk_apb_timer_read(void *opaque, hwaddr offset, unsigned size) > { > - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(opaque); > + CMSDKAPBTimer *s = CMSDK_APB_TIMER(opaque); > uint64_t r; > > switch (offset) { > @@ -106,7 +106,7 @@ static uint64_t cmsdk_apb_timer_read(void *opaque, hwaddr offset, unsigned size) > static void cmsdk_apb_timer_write(void *opaque, hwaddr offset, uint64_t value, > unsigned size) > { > - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(opaque); > + CMSDKAPBTimer *s = CMSDK_APB_TIMER(opaque); > > trace_cmsdk_apb_timer_write(offset, value, size); > > @@ -181,7 +181,7 @@ static const MemoryRegionOps cmsdk_apb_timer_ops = { > > static void cmsdk_apb_timer_tick(void *opaque) > { > - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(opaque); > + CMSDKAPBTimer *s = CMSDK_APB_TIMER(opaque); > > if (s->ctrl & R_CTRL_IRQEN_MASK) { > s->intstatus |= R_INTSTATUS_IRQ_MASK; > @@ -191,7 +191,7 @@ static void cmsdk_apb_timer_tick(void *opaque) > > static void cmsdk_apb_timer_reset(DeviceState *dev) > { > - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(dev); > + CMSDKAPBTimer *s = CMSDK_APB_TIMER(dev); > > trace_cmsdk_apb_timer_reset(); > s->ctrl = 0; > @@ -206,7 +206,7 @@ static void cmsdk_apb_timer_reset(DeviceState *dev) > static void cmsdk_apb_timer_init(Object *obj) > { > SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(obj); > + CMSDKAPBTimer *s = CMSDK_APB_TIMER(obj); > > memory_region_init_io(&s->iomem, obj, &cmsdk_apb_timer_ops, > s, "cmsdk-apb-timer", 0x1000); > @@ -216,7 +216,7 @@ static void cmsdk_apb_timer_init(Object *obj) > > static void cmsdk_apb_timer_realize(DeviceState *dev, Error **errp) > { > - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(dev); > + CMSDKAPBTimer *s = CMSDK_APB_TIMER(dev); > > if (s->pclk_frq == 0) { > error_setg(errp, "CMSDK APB timer: pclk-frq property must be set"); > @@ -239,17 +239,17 @@ static const VMStateDescription cmsdk_apb_timer_vmstate = { > .version_id = 1, > .minimum_version_id = 1, > .fields = (VMStateField[]) { > - VMSTATE_PTIMER(timer, CMSDKAPBTIMER), > - VMSTATE_UINT32(ctrl, CMSDKAPBTIMER), > - VMSTATE_UINT32(value, CMSDKAPBTIMER), > - VMSTATE_UINT32(reload, CMSDKAPBTIMER), > - VMSTATE_UINT32(intstatus, CMSDKAPBTIMER), > + VMSTATE_PTIMER(timer, CMSDKAPBTimer), > + VMSTATE_UINT32(ctrl, CMSDKAPBTimer), > + VMSTATE_UINT32(value, CMSDKAPBTimer), > + VMSTATE_UINT32(reload, CMSDKAPBTimer), > + VMSTATE_UINT32(intstatus, CMSDKAPBTimer), > VMSTATE_END_OF_LIST() > } > }; > > static Property cmsdk_apb_timer_properties[] = { > - DEFINE_PROP_UINT32("pclk-frq", CMSDKAPBTIMER, pclk_frq, 0), > + DEFINE_PROP_UINT32("pclk-frq", CMSDKAPBTimer, pclk_frq, 0), > DEFINE_PROP_END_OF_LIST(), > }; > > @@ -266,7 +266,7 @@ static void cmsdk_apb_timer_class_init(ObjectClass *klass, void *data) > static const TypeInfo cmsdk_apb_timer_info = { > .name = TYPE_CMSDK_APB_TIMER, > .parent = TYPE_SYS_BUS_DEVICE, > - .instance_size = sizeof(CMSDKAPBTIMER), > + .instance_size = sizeof(CMSDKAPBTimer), > .instance_init = cmsdk_apb_timer_init, > .class_init = cmsdk_apb_timer_class_init, > }; > -- > 2.20.1 > --