mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vt82c686: Remove unnecessary _DEVICE suffix from type macros

Browse Source 
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 <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <ea89683ebb3528c0f79ed99d3d3cfcefb63c3bfb.1609584216.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
BALATON Zoltan 2021-01-02 11:43:35 +01:00 committed by Philippe Mathieu-Daudé
parent 5a4856ed78
commit e634050544
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hw/isa/vt82c686.c
View File

@ -49,8 +49,8 @@ struct VT82C686BState {
SuperIOConfig superio_conf; SuperIOConfig superio_conf;
}; };
#define TYPE_VT82C686B_DEVICE "VT82C686B" #define TYPE_VT82C686B "VT82C686B"
OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BState, VT82C686B_DEVICE) OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BState, VT82C686B)
static void superio_ioport_writeb(void *opaque, hwaddr addr, uint64_t data, static void superio_ioport_writeb(void *opaque, hwaddr addr, uint64_t data,
unsigned size) unsigned size)
@ -117,7 +117,7 @@ static const MemoryRegionOps superio_ops = {
static void vt82c686b_isa_reset(DeviceState *dev) static void vt82c686b_isa_reset(DeviceState *dev)
{ {
VT82C686BState *vt82c = VT82C686B_DEVICE(dev); VT82C686BState *vt82c = VT82C686B(dev);
uint8_t *pci_conf = vt82c->dev.config; uint8_t *pci_conf = vt82c->dev.config;
pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0); 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, static void vt82c686b_write_config(PCIDevice *d, uint32_t address,
uint32_t val, int len) uint32_t val, int len)
{ {
VT82C686BState *vt686 = VT82C686B_DEVICE(d); VT82C686BState *vt686 = VT82C686B(d);
DPRINTF("vt82c686b_write_config address 0x%x val 0x%x len 0x%x\n", DPRINTF("vt82c686b_write_config address 0x%x val 0x%x len 0x%x\n",
address, val, len); address, val, len);
@ -176,14 +176,14 @@ struct VIAMC97State {
PCIDevice dev; PCIDevice dev;
}; };
#define TYPE_VT82C686B_PM_DEVICE "VT82C686B_PM" #define TYPE_VT82C686B_PM "VT82C686B_PM"
OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM_DEVICE) OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM)
#define TYPE_VIA_MC97_DEVICE "VIA_MC97" #define TYPE_VIA_MC97 "VIA_MC97"
OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97_DEVICE) OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97)
#define TYPE_VIA_AC97_DEVICE "VIA_AC97" #define TYPE_VIA_AC97 "VIA_AC97"
OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97_DEVICE) OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97)
static void pm_update_sci(VT686PMState *s) static void pm_update_sci(VT686PMState *s)
{ {
@ -260,7 +260,7 @@ static const VMStateDescription vmstate_acpi = {
static void vt82c686b_ac97_realize(PCIDevice *dev, Error **errp) static void vt82c686b_ac97_realize(PCIDevice *dev, Error **errp)
{ {
VIAAC97State *s = VIA_AC97_DEVICE(dev); VIAAC97State *s = VIA_AC97(dev);
uint8_t *pci_conf = s->dev.config; uint8_t *pci_conf = s->dev.config;
pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
@ -274,7 +274,7 @@ void vt82c686b_ac97_init(PCIBus *bus, int devfn)
{ {
PCIDevice *dev; PCIDevice *dev;
dev = pci_new(devfn, TYPE_VIA_AC97_DEVICE); dev = pci_new(devfn, TYPE_VIA_AC97);
pci_realize_and_unref(dev, bus, &error_fatal); pci_realize_and_unref(dev, bus, &error_fatal);
} }
@ -293,7 +293,7 @@ static void via_ac97_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo via_ac97_info = { static const TypeInfo via_ac97_info = {
.name = TYPE_VIA_AC97_DEVICE, .name = TYPE_VIA_AC97,
.parent = TYPE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(VIAAC97State), .instance_size = sizeof(VIAAC97State),
.class_init = via_ac97_class_init, .class_init = via_ac97_class_init,
@ -305,7 +305,7 @@ static const TypeInfo via_ac97_info = {
static void vt82c686b_mc97_realize(PCIDevice *dev, Error **errp) static void vt82c686b_mc97_realize(PCIDevice *dev, Error **errp)
{ {
VIAMC97State *s = VIA_MC97_DEVICE(dev); VIAMC97State *s = VIA_MC97(dev);
uint8_t *pci_conf = s->dev.config; uint8_t *pci_conf = s->dev.config;
pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
@ -318,7 +318,7 @@ void vt82c686b_mc97_init(PCIBus *bus, int devfn)
{ {
PCIDevice *dev; PCIDevice *dev;
dev = pci_new(devfn, TYPE_VIA_MC97_DEVICE); dev = pci_new(devfn, TYPE_VIA_MC97);
pci_realize_and_unref(dev, bus, &error_fatal); pci_realize_and_unref(dev, bus, &error_fatal);
} }
@ -337,7 +337,7 @@ static void via_mc97_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo via_mc97_info = { static const TypeInfo via_mc97_info = {
.name = TYPE_VIA_MC97_DEVICE, .name = TYPE_VIA_MC97,
.parent = TYPE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(VIAMC97State), .instance_size = sizeof(VIAMC97State),
.class_init = via_mc97_class_init, .class_init = via_mc97_class_init,
@ -350,7 +350,7 @@ static const TypeInfo via_mc97_info = {
/* vt82c686 pm init */ /* vt82c686 pm init */
static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp) static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp)
{ {
VT686PMState *s = VT82C686B_PM_DEVICE(dev); VT686PMState *s = VT82C686B_PM(dev);
uint8_t *pci_conf; uint8_t *pci_conf;
pci_conf = s->dev.config; pci_conf = s->dev.config;
@ -386,10 +386,10 @@ I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
PCIDevice *dev; PCIDevice *dev;
VT686PMState *s; VT686PMState *s;
dev = pci_new(devfn, TYPE_VT82C686B_PM_DEVICE); dev = pci_new(devfn, TYPE_VT82C686B_PM);
qdev_prop_set_uint32(&dev->qdev, "smb_io_base", smb_io_base); qdev_prop_set_uint32(&dev->qdev, "smb_io_base", smb_io_base);
s = VT82C686B_PM_DEVICE(dev); s = VT82C686B_PM(dev);
pci_realize_and_unref(dev, bus, &error_fatal); pci_realize_and_unref(dev, bus, &error_fatal);
@ -419,7 +419,7 @@ static void via_pm_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo via_pm_info = { static const TypeInfo via_pm_info = {
.name = TYPE_VT82C686B_PM_DEVICE, .name = TYPE_VT82C686B_PM,
.parent = TYPE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(VT686PMState), .instance_size = sizeof(VT686PMState),
.class_init = via_pm_class_init, .class_init = via_pm_class_init,
@ -442,7 +442,7 @@ static const VMStateDescription vmstate_via = {
/* init the PCI-to-ISA bridge */ /* init the PCI-to-ISA bridge */
static void vt82c686b_realize(PCIDevice *d, Error **errp) static void vt82c686b_realize(PCIDevice *d, Error **errp)
{ {
VT82C686BState *vt82c = VT82C686B_DEVICE(d); VT82C686BState *vt82c = VT82C686B(d);
uint8_t *pci_conf; uint8_t *pci_conf;
ISABus *isa_bus; ISABus *isa_bus;
uint8_t *wmask; uint8_t *wmask;
@ -479,9 +479,7 @@ ISABus *vt82c686b_isa_init(PCIBus *bus, int devfn)
{ {
PCIDevice *d; PCIDevice *d;
d = pci_create_simple_multifunction(bus, devfn, true, d = pci_create_simple_multifunction(bus, devfn, true, TYPE_VT82C686B);
TYPE_VT82C686B_DEVICE);
return ISA_BUS(qdev_get_child_bus(DEVICE(d), "isa.0")); return ISA_BUS(qdev_get_child_bus(DEVICE(d), "isa.0"));
} }
@ -507,7 +505,7 @@ static void via_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo via_info = { static const TypeInfo via_info = {
.name = TYPE_VT82C686B_DEVICE, .name = TYPE_VT82C686B,
.parent = TYPE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(VT82C686BState), .instance_size = sizeof(VT82C686BState),
.class_init = via_class_init, .class_init = via_class_init,