[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 50/63] tpm_crb: Rename CRB to TPM_CRB
From: |
Eduardo Habkost |
Subject: |
[PATCH 50/63] tpm_crb: Rename CRB to TPM_CRB |
Date: |
Wed, 2 Sep 2020 18:42:58 -0400 |
Make the type checking macro name consistent with the TYPE_*
constant.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Stefan Berger <stefanb@linux.ibm.com>
Cc: qemu-devel@nongnu.org
---
hw/tpm/tpm_crb.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c
index aa9c00aad3..f4e3f0abbc 100644
--- a/hw/tpm/tpm_crb.c
+++ b/hw/tpm/tpm_crb.c
@@ -47,7 +47,7 @@ struct CRBState {
};
typedef struct CRBState CRBState;
-DECLARE_INSTANCE_CHECKER(CRBState, CRB,
+DECLARE_INSTANCE_CHECKER(CRBState, TPM_CRB,
TYPE_TPM_CRB)
#define CRB_INTF_TYPE_CRB_ACTIVE 0b1
@@ -86,7 +86,7 @@ enum crb_cancel {
static uint64_t tpm_crb_mmio_read(void *opaque, hwaddr addr,
unsigned size)
{
- CRBState *s = CRB(opaque);
+ CRBState *s = TPM_CRB(opaque);
void *regs = (void *)&s->regs + (addr & ~3);
unsigned offset = addr & 3;
uint32_t val = *(uint32_t *)regs >> (8 * offset);
@@ -113,7 +113,7 @@ static uint8_t tpm_crb_get_active_locty(CRBState *s)
static void tpm_crb_mmio_write(void *opaque, hwaddr addr,
uint64_t val, unsigned size)
{
- CRBState *s = CRB(opaque);
+ CRBState *s = TPM_CRB(opaque);
uint8_t locty = addr >> 12;
trace_tpm_crb_mmio_write(addr, size, val);
@@ -190,7 +190,7 @@ static const MemoryRegionOps tpm_crb_memory_ops = {
static void tpm_crb_request_completed(TPMIf *ti, int ret)
{
- CRBState *s = CRB(ti);
+ CRBState *s = TPM_CRB(ti);
s->regs[R_CRB_CTRL_START] &= ~CRB_START_INVOKE;
if (ret != 0) {
@@ -201,7 +201,7 @@ static void tpm_crb_request_completed(TPMIf *ti, int ret)
static enum TPMVersion tpm_crb_get_version(TPMIf *ti)
{
- CRBState *s = CRB(ti);
+ CRBState *s = TPM_CRB(ti);
return tpm_backend_get_tpm_version(s->tpmbe);
}
@@ -232,7 +232,7 @@ static Property tpm_crb_properties[] = {
static void tpm_crb_reset(void *dev)
{
- CRBState *s = CRB(dev);
+ CRBState *s = TPM_CRB(dev);
if (s->ppi_enabled) {
tpm_ppi_reset(&s->ppi);
@@ -281,7 +281,7 @@ static void tpm_crb_reset(void *dev)
static void tpm_crb_realize(DeviceState *dev, Error **errp)
{
- CRBState *s = CRB(dev);
+ CRBState *s = TPM_CRB(dev);
if (!tpm_find()) {
error_setg(errp, "at most one TPM device is permitted");
--
2.26.2
- [PATCH 46/63] renesas: Rename RTMR to RENESAS_TMR, (continued)
- [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
- [PATCH 49/63] stm32f205: Rename STM32F2XXTIMER to STM32F2XX_TIMER, Eduardo Habkost, 2020/09/02
- [PATCH 48/63] sabre: Rename SABRE_DEVICE to SABRE, Eduardo Habkost, 2020/09/02
- [PATCH 50/63] tpm_crb: Rename CRB to TPM_CRB,
Eduardo Habkost <=
- [PATCH 52/63] usb: Rename USB_REDIRECT to USB_REDIR, Eduardo Habkost, 2020/09/02
- [PATCH 51/63] tpm_spapr: Rename VIO_SPAPR_VTPM to TPM_SPAPR, Eduardo Habkost, 2020/09/02
- [PATCH 53/63] usb: Rename USB_SERIAL_DEV to USB_SERIAL, Eduardo Habkost, 2020/09/02
- [PATCH 54/63] usb: Rename USB_STORAGE_DEV to USB_STORAGE, Eduardo Habkost, 2020/09/02
- [PATCH 56/63] vmxnet3: Rename VMXNET3_DEVICE* to VMXNET3*, Eduardo Habkost, 2020/09/02
- [PATCH 55/63] vfio: Rename PCI_VFIO to VFIO_PCI, Eduardo Habkost, 2020/09/02