[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 41/63] lance: Rename SYSBUS_PCNET to LANCE
From: |
Eduardo Habkost |
Subject: |
[PATCH 41/63] lance: Rename SYSBUS_PCNET to LANCE |
Date: |
Wed, 2 Sep 2020 18:42:49 -0400 |
Make the type checking macro name consistent with the TYPE_*
constant.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Jason Wang <jasowang@redhat.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Cc: qemu-devel@nongnu.org
---
include/hw/net/lance.h | 2 +-
hw/net/lance.c | 6 +++---
hw/sparc/sun4m.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/hw/net/lance.h b/include/hw/net/lance.h
index f645d6af67..a0434f1254 100644
--- a/include/hw/net/lance.h
+++ b/include/hw/net/lance.h
@@ -36,7 +36,7 @@
#define TYPE_LANCE "lance"
typedef struct SysBusPCNetState SysBusPCNetState;
-DECLARE_INSTANCE_CHECKER(SysBusPCNetState, SYSBUS_PCNET,
+DECLARE_INSTANCE_CHECKER(SysBusPCNetState, LANCE,
TYPE_LANCE)
struct SysBusPCNetState {
diff --git a/hw/net/lance.c b/hw/net/lance.c
index 4c5f01baad..47ab7e1847 100644
--- a/hw/net/lance.c
+++ b/hw/net/lance.c
@@ -103,7 +103,7 @@ static const VMStateDescription vmstate_lance = {
static void lance_realize(DeviceState *dev, Error **errp)
{
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
- SysBusPCNetState *d = SYSBUS_PCNET(dev);
+ SysBusPCNetState *d = LANCE(dev);
PCNetState *s = &d->state;
memory_region_init_io(&s->mmio, OBJECT(d), &lance_mem_ops, d,
@@ -122,14 +122,14 @@ static void lance_realize(DeviceState *dev, Error **errp)
static void lance_reset(DeviceState *dev)
{
- SysBusPCNetState *d = SYSBUS_PCNET(dev);
+ SysBusPCNetState *d = LANCE(dev);
pcnet_h_reset(&d->state);
}
static void lance_instance_init(Object *obj)
{
- SysBusPCNetState *d = SYSBUS_PCNET(obj);
+ SysBusPCNetState *d = LANCE(obj);
PCNetState *s = &d->state;
device_add_bootindex_property(obj, &s->conf.bootindex,
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 3ee7ef4590..192cb87658 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -353,7 +353,7 @@ static void *sparc32_dma_init(hwaddr dma_base,
OBJECT(dma), "ledma"));
sysbus_connect_irq(SYS_BUS_DEVICE(ledma), 0, ledma_irq);
- lance = SYSBUS_PCNET(object_resolve_path_component(
+ lance = LANCE(object_resolve_path_component(
OBJECT(ledma), "lance"));
sysbus_mmio_map(SYS_BUS_DEVICE(lance), 0, le_base);
--
2.26.2
- [PATCH 35/63] can: Rename MIOe3680_PCI_DEV to MIOE3680_PCI, (continued)
- [PATCH 35/63] can: Rename MIOe3680_PCI_DEV to MIOE3680_PCI, Eduardo Habkost, 2020/09/02
- [PATCH 32/63] ahci: Rename ICH_AHCI to ICH9_AHCI, Eduardo Habkost, 2020/09/02
- [PATCH 36/63] can: Rename PCM3680i_PCI_DEV to PCM3680_PCI, Eduardo Habkost, 2020/09/02
- [PATCH 37/63] ccid-card-emulated: Rename EMULATED_CCID_CARD to EMULATED_CCID, Eduardo Habkost, 2020/09/02
- [PATCH 38/63] ccid-card-passthru: Rename PASSTHRU_CCID_CARD to CCID_PASSTHRU, Eduardo Habkost, 2020/09/02
- [PATCH 39/63] esp: Rename ESP_STATE to ESP, Eduardo Habkost, 2020/09/02
- [PATCH 41/63] lance: Rename SYSBUS_PCNET to LANCE,
Eduardo Habkost <=
- [PATCH 40/63] filter-rewriter: Rename FILTER_COLO_REWRITER to FILTER_REWRITER, Eduardo Habkost, 2020/09/02
- [PATCH 42/63] lasi_i82596: Rename SYSBUS_I82596 to LASI_82596, Eduardo Habkost, 2020/09/02
- [PATCH 43/63] pvpanic: Rename ISA_PVPANIC_DEVICE to PVPANIC, Eduardo Habkost, 2020/09/02
- [PATCH 44/63] renesas: Rename RCMT to RENESAS_CMT, Eduardo Habkost, 2020/09/02
- [PATCH 46/63] renesas: Rename RTMR to RENESAS_TMR, Eduardo Habkost, 2020/09/02
- [PATCH 45/63] renesas: Rename RSCI to RENESAS_SCI, Eduardo Habkost, 2020/09/02
- [PATCH 47/63] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC, Eduardo Habkost, 2020/09/02