From nobody Tue Feb 10 06:07:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1576782516; cv=none; d=zohomail.com; s=zohoarc; b=Wmjp79O8rdzwRbTqj5DH/U/RndFQQcUuPyPTyWpbys6F7RcTZ6JTHdlCRVyJzIX5k5dcqpdogwkfgdMeEDRMFAEq/DVnNObH5Ew3N0L0HTBPfaBEsj7aGtHtAw2tlA9HXFu7D8BPLnGWQTsDs2TLjskXB3L5U/Xs40hViqcDbc4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576782516; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qyhQROH0zglq4XFW1HtOmFf0aWLykn31mbrW4dYgWlw=; b=SrvWkQ2J+N1ljQmWLvQokVQysEsED0E3ts/h9cXdRUW+buILIqSdhBCJ0HGlp09wJ4w8d4g4emfzNcVQGyq++spHEo8y/jfHdymcE9wA2sHbDVqVakXO8fQmlRHTdMmM31jqoAB9EMu3+8fOWo4lwB5zt4kc343dfPHGRX8WcFo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157678251664545.35779721591268; Thu, 19 Dec 2019 11:08:36 -0800 (PST) Received: from localhost ([::1]:46884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ii1A3-0001Fy-Im for importer@patchew.org; Thu, 19 Dec 2019 14:08:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40484) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ii0tn-0007Ib-5k for qemu-devel@nongnu.org; Thu, 19 Dec 2019 13:51:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ii0tl-00005z-T8 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 13:51:46 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:45869) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ii0tl-0008Rd-H0; Thu, 19 Dec 2019 13:51:45 -0500 Received: by mail-wr1-x442.google.com with SMTP id j42so7020594wrj.12; Thu, 19 Dec 2019 10:51:45 -0800 (PST) Received: from x1w.redhat.com (34.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.34]) by smtp.gmail.com with ESMTPSA id b67sm7435494wmc.38.2019.12.19.10.51.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 10:51:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qyhQROH0zglq4XFW1HtOmFf0aWLykn31mbrW4dYgWlw=; b=i5YwH8bvSKpQxpoKJrLWZAqXtF9THcvR3lEO9kEGOQsJFg93pncnTmCvOGe+0LRMJI VJNcEjLRMfudXXBAbr5e0GFY2tuLHKzM5A44Jve7P5OjusD5ul3eNGhz3vb+TZADDYmC GAwl7ozdCO+amGeMBP604ChVmVJRjW3EGR/HBGTQLJVcrjr+06dNRXmAa5oNLt3MY80l OYIZi/TW95hb5+pOXo4zTRoks3G7IUPkIkT7Oo2/9RynfzlEf6gZD1tYm4EdzG49Cod0 mqJdH1feN8TDjQ8vRZyJQT87WxD8135vpWsbOb8osGZOeK2IjFJoO+zaBjxF5XcN5JSH +Bjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qyhQROH0zglq4XFW1HtOmFf0aWLykn31mbrW4dYgWlw=; b=Q6L3yPFW83z/JeKG5NkXpFEXrMD7UpMUQAG3fs8ZbqcrQ6NHlfyjvMRFooQmTReIKP 3rk9diS17YzXubB/zGsTtzlc6+Tv0Ix3ebDKsxl0K1EG9RvaxyYLqRlOMOoOfdzoY22+ n/LJOK7bz8kRrEW2zbgkpiEnZA5BdV00qm40Xtrn10PMnZqEPILNjeG5G7CUCP3yBnh5 Es6MSuPgIqRzHHd5/txNkhxllIdIb/rIxPWNRQHo43IN1HEwx+VBEoh7ElFgyh9AwoRh Oc8O2L04T5zAEUV7XJKc88fmimboHKztZ/Td190f3kxkQ2K83Z9Dh4toJdongtrSyZ+s xH4Q== X-Gm-Message-State: APjAAAVH62bM50N9Cd9FyPHIbA6oItdYdRNX8Sj0K1WYjVgSuws0B0E8 y4uEUBEe7CAaCKX6sna36FD11G56 X-Google-Smtp-Source: APXvYqwfViom5RRGMotWWzFz7ZtejLLvnO4yQepB8PTG9RICXrSIdBWCsQnRweCWjT0yyeFDztq8Pg== X-Received: by 2002:a5d:4807:: with SMTP id l7mr11320272wrq.64.1576781504198; Thu, 19 Dec 2019 10:51:44 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Niek Linnenbank Subject: [RFC PATCH 12/13] hw/timer/allwinner: Rename AW_A10_PIT() as AW_TIMER_CTRL() Date: Thu, 19 Dec 2019 19:51:26 +0100 Message-Id: <20191219185127.24388-13-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191219185127.24388-1-f4bug@amsat.org> References: <20191219185127.24388-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 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: Beniamino Galvani , Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This macro is now used by different Allwinner timer controllers, rename it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/allwinner-a10-pit.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index ad409b96a1..7413f046cc 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -51,8 +51,8 @@ =20 #define AW_A10_PIT_DEFAULT_CLOCK 0x4 =20 -#define AW_A10_PIT(obj) \ - OBJECT_CHECK(AllwinnerTmrCtrlState, (obj), TYPE_AW_A10_PIT) +#define AW_TIMER_CTRL(obj) \ + OBJECT_CHECK(AllwinnerTmrCtrlState, (obj), TYPE_AW_COMMON_PIT) =20 typedef struct AllwinnerTmrCtrlClass { /*< private >*/ @@ -80,7 +80,7 @@ static void a10_pit_update_irq(AllwinnerTmrCtrlState *s) =20 static uint64_t a10_pit_read(void *opaque, hwaddr offset, unsigned size) { - AllwinnerTmrCtrlState *s =3D AW_A10_PIT(opaque); + AllwinnerTmrCtrlState *s =3D AW_TIMER_CTRL(opaque); uint8_t index; =20 switch (offset) { @@ -144,7 +144,7 @@ static void a10_pit_set_freq(AllwinnerTmrCtrlState *s, = int index) static void a10_pit_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { - AllwinnerTmrCtrlState *s =3D AW_A10_PIT(opaque); + AllwinnerTmrCtrlState *s =3D AW_TIMER_CTRL(opaque); uint8_t index; =20 switch (offset) { @@ -278,7 +278,7 @@ static const VMStateDescription vmstate_a10_pit =3D { =20 static void a10_pit_reset(DeviceState *dev) { - AllwinnerTmrCtrlState *s =3D AW_A10_PIT(dev); + AllwinnerTmrCtrlState *s =3D AW_TIMER_CTRL(dev); uint8_t i; =20 s->irq_enable =3D 0; @@ -319,7 +319,7 @@ static void a10_pit_timer_cb(void *opaque) =20 static void aw_pit_instance_init(Object *obj) { - AllwinnerTmrCtrlState *s =3D AW_A10_PIT(obj); + AllwinnerTmrCtrlState *s =3D AW_TIMER_CTRL(obj); AllwinnerTmrCtrlClass *c =3D AW_TIMER_GET_CLASS(s); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); uint8_t i; @@ -330,7 +330,7 @@ static void aw_pit_instance_init(Object *obj) sysbus_init_irq(sbd, &s->timer[i].irq); } memory_region_init_io(&s->iomem, OBJECT(s), &a10_pit_ops, s, - TYPE_AW_A10_PIT, c->region_size); + TYPE_AW_COMMON_PIT, c->region_size); sysbus_init_mmio(sbd, &s->iomem); =20 for (i =3D 0; i < s->timer_count; i++) { --=20 2.21.0