From nobody Tue Nov 18 10:37:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609707064; cv=none; d=zohomail.com; s=zohoarc; b=RJX7HB1Gon/tqpPVswZvXNdBsDuMADZvrxUvFsuUXuTbhB3+F+Oqj/ksfx8/4cvVXfeGwSXI/7XJyStM10p1xPH1OkkaeHF44aiPDd9Au6AfWcPgWI+k2JQ0/rYafM3Fj20Y0Af8Miw+w/u3KLRl+GMTQZzxy7B/+N5TwBssn+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707064; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I0Qx7xrqmoPP3gg4/cVniQfedaijI77x9Nh3r7Ky0Is=; b=Ur7Erid96zwYgpks/hYlmm8Nv0RcHupgMu9mJyduBSNfGyrqUREsWj5EalmeTZsYJcm2NAKdpzEuN92X9hv8UPeMRt8EihCTh+y3hS/232q+4B5Sfgw/Th+6eF4gPV5Hk+NaINe6mV23wXG54tSBkOlAfXi/xoCfgqAs2TJieC0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1609707064736439.30048060706736; Sun, 3 Jan 2021 12:51:04 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id r7so29447277wrc.5 for ; Sun, 03 Jan 2021 12:51:04 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (194.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.194]) by smtp.gmail.com with ESMTPSA id v1sm29170946wmj.31.2021.01.03.12.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:51:02 -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=I0Qx7xrqmoPP3gg4/cVniQfedaijI77x9Nh3r7Ky0Is=; b=nh2N+BbjJntilJGIP8zA6Dvb4T+WeDH0ayurtFeCnwPm0iR+iuXTQ14iswTND3pDWv 3rDM/OK6IPOsD8sYqltf+jaZI0Y7ywHVzNM4GzrnjnUUbemnHQsV/dySlZ0RnGRRNTnV FY2ZrokhzIXesBM9NY3FOSir2b0hcxcQaFCI5ZY8qjBHCrcOnOLqPOM7emym6d+IPqRl dvTKhAcW47ZQZE+sWBe/BrWb1Vwd+JttcOt2NTTFvSp/kWGSYMgZ4tIUSXCLlWuTEZk0 IloNFfyGhWZWcZ0kIc/30yYZ+VQrk4zPbR4jDwQ98aV7ZxBAiFyGc3H2GXUrYF1ML6Of l7nQ== 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=I0Qx7xrqmoPP3gg4/cVniQfedaijI77x9Nh3r7Ky0Is=; b=JxczKrmmxDaOtnbxIs7zAPM3ne7wjBS2VLTDog/8vN6+K96Q8IU+zs/u5kUlt4bsvT luUC9YXJBD0w8gyP5gtZXs9HMVbFFMA/t+60aebfm1PJIYnrQUpqa3AlrOfeSEKE4sfr hTDmNUbTBnbZY4g9/a1Ki/u0CNwBpL5hAdyunrWwMfHefkqR2ayiFIzHACCkg8keqI7z 6s6V1r+MW6F7/b9ieIJs6rCMcxt0V/IKvEW61EpVY9TTx+xQQ/H6IZ8couIDHqJA+PLO vQyROsjsX/6UXJDae5JdjuiMFn1XjuUOxNu1K34IJTEk3cAU/w283AuaHozUNSFFBhsE uZcg== X-Gm-Message-State: AOAM533lHB9mvtFFMzvKOlYZgYGGuR5QphwS+V78earqmSXDJ4iW/EN7 krTiLoWQhLFlpHmm73r3tac= X-Google-Smtp-Source: ABdhPJxFUMGc0yzl1B3G/E1E+/27Jyi8yLpGJ2asiXdd6Fk7GQPYQS+NsCohsvNFl+chWuICxbsAhA== X-Received: by 2002:a5d:55c6:: with SMTP id i6mr76433027wrw.137.1609707062935; Sun, 03 Jan 2021 12:51:02 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Huacai Chen , Jiaxun Yang , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 08/35] vt82c686: Remove unnecessary _DEVICE suffix from type macros Date: Sun, 3 Jan 2021 21:49:54 +0100 Message-Id: <20210103205021.2837760-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210103205021.2837760-1-f4bug@amsat.org> References: <20210103205021.2837760-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: BALATON Zoltan There's no reason to suffix everything with _DEVICE when the names are already unique without it and shorter names are more readable. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 48 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 2a0f85dea94..1be1169f83a 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -49,8 +49,8 @@ struct VT82C686BState { SuperIOConfig superio_conf; }; =20 -#define TYPE_VT82C686B_DEVICE "VT82C686B" -OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BState, VT82C686B_DEVICE) +#define TYPE_VT82C686B "VT82C686B" +OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BState, VT82C686B) =20 static void superio_ioport_writeb(void *opaque, hwaddr addr, uint64_t data, unsigned size) @@ -117,7 +117,7 @@ static const MemoryRegionOps superio_ops =3D { =20 static void vt82c686b_isa_reset(DeviceState *dev) { - VT82C686BState *vt82c =3D VT82C686B_DEVICE(dev); + VT82C686BState *vt82c =3D VT82C686B(dev); uint8_t *pci_conf =3D vt82c->dev.config; =20 pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0); @@ -146,7 +146,7 @@ static void vt82c686b_isa_reset(DeviceState *dev) static void vt82c686b_write_config(PCIDevice *d, uint32_t address, uint32_t val, int len) { - VT82C686BState *vt686 =3D VT82C686B_DEVICE(d); + VT82C686BState *vt686 =3D VT82C686B(d); =20 DPRINTF("vt82c686b_write_config address 0x%x val 0x%x len 0x%x\n", address, val, len); @@ -176,14 +176,14 @@ struct VIAMC97State { PCIDevice dev; }; =20 -#define TYPE_VT82C686B_PM_DEVICE "VT82C686B_PM" -OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM_DEVICE) +#define TYPE_VT82C686B_PM "VT82C686B_PM" +OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM) =20 -#define TYPE_VIA_MC97_DEVICE "VIA_MC97" -OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97_DEVICE) +#define TYPE_VIA_MC97 "VIA_MC97" +OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97) =20 -#define TYPE_VIA_AC97_DEVICE "VIA_AC97" -OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97_DEVICE) +#define TYPE_VIA_AC97 "VIA_AC97" +OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97) =20 static void pm_update_sci(VT686PMState *s) { @@ -260,7 +260,7 @@ static const VMStateDescription vmstate_acpi =3D { =20 static void vt82c686b_ac97_realize(PCIDevice *dev, Error **errp) { - VIAAC97State *s =3D VIA_AC97_DEVICE(dev); + VIAAC97State *s =3D VIA_AC97(dev); uint8_t *pci_conf =3D s->dev.config; =20 pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | @@ -274,7 +274,7 @@ void vt82c686b_ac97_init(PCIBus *bus, int devfn) { PCIDevice *dev; =20 - dev =3D pci_new(devfn, TYPE_VIA_AC97_DEVICE); + dev =3D pci_new(devfn, TYPE_VIA_AC97); pci_realize_and_unref(dev, bus, &error_fatal); } =20 @@ -293,7 +293,7 @@ static void via_ac97_class_init(ObjectClass *klass, voi= d *data) } =20 static const TypeInfo via_ac97_info =3D { - .name =3D TYPE_VIA_AC97_DEVICE, + .name =3D TYPE_VIA_AC97, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(VIAAC97State), .class_init =3D via_ac97_class_init, @@ -305,7 +305,7 @@ static const TypeInfo via_ac97_info =3D { =20 static void vt82c686b_mc97_realize(PCIDevice *dev, Error **errp) { - VIAMC97State *s =3D VIA_MC97_DEVICE(dev); + VIAMC97State *s =3D VIA_MC97(dev); uint8_t *pci_conf =3D s->dev.config; =20 pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | @@ -318,7 +318,7 @@ void vt82c686b_mc97_init(PCIBus *bus, int devfn) { PCIDevice *dev; =20 - dev =3D pci_new(devfn, TYPE_VIA_MC97_DEVICE); + dev =3D pci_new(devfn, TYPE_VIA_MC97); pci_realize_and_unref(dev, bus, &error_fatal); } =20 @@ -337,7 +337,7 @@ static void via_mc97_class_init(ObjectClass *klass, voi= d *data) } =20 static const TypeInfo via_mc97_info =3D { - .name =3D TYPE_VIA_MC97_DEVICE, + .name =3D TYPE_VIA_MC97, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(VIAMC97State), .class_init =3D via_mc97_class_init, @@ -350,7 +350,7 @@ static const TypeInfo via_mc97_info =3D { /* vt82c686 pm init */ static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp) { - VT686PMState *s =3D VT82C686B_PM_DEVICE(dev); + VT686PMState *s =3D VT82C686B_PM(dev); uint8_t *pci_conf; =20 pci_conf =3D s->dev.config; @@ -386,10 +386,10 @@ I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uin= t32_t smb_io_base, PCIDevice *dev; VT686PMState *s; =20 - dev =3D pci_new(devfn, TYPE_VT82C686B_PM_DEVICE); + dev =3D pci_new(devfn, TYPE_VT82C686B_PM); qdev_prop_set_uint32(&dev->qdev, "smb_io_base", smb_io_base); =20 - s =3D VT82C686B_PM_DEVICE(dev); + s =3D VT82C686B_PM(dev); =20 pci_realize_and_unref(dev, bus, &error_fatal); =20 @@ -419,7 +419,7 @@ static void via_pm_class_init(ObjectClass *klass, void = *data) } =20 static const TypeInfo via_pm_info =3D { - .name =3D TYPE_VT82C686B_PM_DEVICE, + .name =3D TYPE_VT82C686B_PM, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(VT686PMState), .class_init =3D via_pm_class_init, @@ -442,7 +442,7 @@ static const VMStateDescription vmstate_via =3D { /* init the PCI-to-ISA bridge */ static void vt82c686b_realize(PCIDevice *d, Error **errp) { - VT82C686BState *vt82c =3D VT82C686B_DEVICE(d); + VT82C686BState *vt82c =3D VT82C686B(d); uint8_t *pci_conf; ISABus *isa_bus; uint8_t *wmask; @@ -479,9 +479,7 @@ ISABus *vt82c686b_isa_init(PCIBus *bus, int devfn) { PCIDevice *d; =20 - d =3D pci_create_simple_multifunction(bus, devfn, true, - TYPE_VT82C686B_DEVICE); - + d =3D pci_create_simple_multifunction(bus, devfn, true, TYPE_VT82C686B= ); return ISA_BUS(qdev_get_child_bus(DEVICE(d), "isa.0")); } =20 @@ -507,7 +505,7 @@ static void via_class_init(ObjectClass *klass, void *da= ta) } =20 static const TypeInfo via_info =3D { - .name =3D TYPE_VT82C686B_DEVICE, + .name =3D TYPE_VT82C686B, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(VT82C686BState), .class_init =3D via_class_init, --=20 2.26.2