[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/5] hw/i2c/versatile_i2c: Use ARM_SBCON_I2C() macro
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 4/5] hw/i2c/versatile_i2c: Use ARM_SBCON_I2C() macro |
Date: |
Tue, 10 Jan 2023 09:25:07 +0100 |
ARM_SBCON_I2C() macro and ArmSbconI2CState typedef are
already declared via the QOM DECLARE_INSTANCE_CHECKER()
macro in "hw/i2c/arm_sbcon_i2c.h". Drop the VERSATILE_I2C
declarations from versatile_i2c.c.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/i2c/versatile_i2c.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/hw/i2c/versatile_i2c.c b/hw/i2c/versatile_i2c.c
index b95c70608b..d19df62265 100644
--- a/hw/i2c/versatile_i2c.c
+++ b/hw/i2c/versatile_i2c.c
@@ -29,11 +29,6 @@
#include "qemu/module.h"
#include "qom/object.h"
-typedef ArmSbconI2CState VersatileI2CState;
-DECLARE_INSTANCE_CHECKER(ArmSbconI2CState, VERSATILE_I2C,
- TYPE_ARM_SBCON_I2C)
-
-
REG32(CONTROL_GET, 0)
REG32(CONTROL_SET, 0)
@@ -86,7 +81,7 @@ static const MemoryRegionOps versatile_i2c_ops = {
static void versatile_i2c_init(Object *obj)
{
DeviceState *dev = DEVICE(obj);
- ArmSbconI2CState *s = VERSATILE_I2C(obj);
+ ArmSbconI2CState *s = ARM_SBCON_I2C(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
I2CBus *bus;
--
2.38.1
- [PATCH v2 0/5] hw/i2c: Rename TYPE_VERSATILE_I2C -> TYPE_ARM_SBCON_I2C, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH v2 1/5] hw/i2c/versatile_i2c: Drop useless casts from void * to pointer, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH v2 2/5] hw/i2c/versatile_i2c: Replace VersatileI2CState -> ArmSbconI2CState, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH v2 3/5] hw/i2c/versatile_i2c: Replace TYPE_VERSATILE_I2C -> TYPE_ARM_SBCON_I2C, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH v2 4/5] hw/i2c/versatile_i2c: Use ARM_SBCON_I2C() macro,
Philippe Mathieu-Daudé <=
- [PATCH v2 5/5] hw/i2c/versatile_i2c: Rename versatile_i2c -> arm_sbcon_i2c, Philippe Mathieu-Daudé, 2023/01/10
- Re: [PATCH v2 0/5] hw/i2c: Rename TYPE_VERSATILE_I2C -> TYPE_ARM_SBCON_I2C, Peter Maydell, 2023/01/17