[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 34/63] can: Rename KVASER_PCI_DEV to KVASER_PCI
From: |
Eduardo Habkost |
Subject: |
[PATCH 34/63] can: Rename KVASER_PCI_DEV to KVASER_PCI |
Date: |
Wed, 2 Sep 2020 18:42:42 -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: qemu-devel@nongnu.org
---
hw/net/can/can_kvaser_pci.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c
index 12d4f8df33..2143ed83f3 100644
--- a/hw/net/can/can_kvaser_pci.c
+++ b/hw/net/can/can_kvaser_pci.c
@@ -48,7 +48,7 @@
#define TYPE_KVASER_PCI "kvaser_pci"
typedef struct KvaserPCIState KvaserPCIState;
-DECLARE_INSTANCE_CHECKER(KvaserPCIState, KVASER_PCI_DEV,
+DECLARE_INSTANCE_CHECKER(KvaserPCIState, KVASER_PCI,
TYPE_KVASER_PCI)
#ifndef KVASER_PCI_VENDOR_ID1
@@ -109,7 +109,7 @@ static void kvaser_pci_irq_handler(void *opaque, int
irq_num, int level)
static void kvaser_pci_reset(DeviceState *dev)
{
- KvaserPCIState *d = KVASER_PCI_DEV(dev);
+ KvaserPCIState *d = KVASER_PCI(dev);
CanSJA1000State *s = &d->sja_state;
can_sja_hardware_reset(s);
@@ -221,7 +221,7 @@ static const MemoryRegionOps kvaser_pci_xilinx_io_ops = {
static void kvaser_pci_realize(PCIDevice *pci_dev, Error **errp)
{
- KvaserPCIState *d = KVASER_PCI_DEV(pci_dev);
+ KvaserPCIState *d = KVASER_PCI(pci_dev);
CanSJA1000State *s = &d->sja_state;
uint8_t *pci_conf;
@@ -254,7 +254,7 @@ static void kvaser_pci_realize(PCIDevice *pci_dev, Error
**errp)
static void kvaser_pci_exit(PCIDevice *pci_dev)
{
- KvaserPCIState *d = KVASER_PCI_DEV(pci_dev);
+ KvaserPCIState *d = KVASER_PCI(pci_dev);
CanSJA1000State *s = &d->sja_state;
can_sja_disconnect(s);
@@ -279,7 +279,7 @@ static const VMStateDescription vmstate_kvaser_pci = {
static void kvaser_pci_instance_init(Object *obj)
{
- KvaserPCIState *d = KVASER_PCI_DEV(obj);
+ KvaserPCIState *d = KVASER_PCI(obj);
object_property_add_link(obj, "canbus", TYPE_CAN_BUS,
(Object **)&d->canbus,
--
2.26.2
- [PATCH 26/63] sun4m: Rename TYPE_SUN4M_MEMORY to TYPE_SUN4M_RAM, (continued)
- [PATCH 26/63] sun4m: Rename TYPE_SUN4M_MEMORY to TYPE_SUN4M_RAM, Eduardo Habkost, 2020/09/02
- [PATCH 28/63] tusb6010: Rename TYPE_TUSB6010 to TYPE_TUSB, Eduardo Habkost, 2020/09/02
- [PATCH 29/63] versatile: Rename TYPE_VERSATILE_PCI_HOST to TYPE_PCI_VPB_HOST, Eduardo Habkost, 2020/09/02
- [PATCH 30/63] versatile: Rename TYPE_VERSATILE_PCI to TYPE_PCI_VPB, Eduardo Habkost, 2020/09/02
- [PATCH 31/63] virtio-console: Rename TYPE_VIRTIO_CONSOLE_SERIAL_PORT to TYPE_VIRTIO_CONSOLE, Eduardo Habkost, 2020/09/02
- [PATCH 33/63] net/can: Rename TYPE_CAN_CPI constants, Eduardo Habkost, 2020/09/02
- [PATCH 34/63] can: Rename KVASER_PCI_DEV to KVASER_PCI,
Eduardo Habkost <=
- [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