diff mbox series

[4/5] hw/i2c/versatile_i2c: Use ARM_SBCON_I2C() macro

Message ID 20230109091754.79499-5-philmd@linaro.org
State Superseded
Headers show
Series hw/i2c: Rename TYPE_VERSATILE_I2C -> TYPE_ARM_SBCON_I2C | expand

Commit Message

Philippe Mathieu-Daudé Jan. 9, 2023, 9:17 a.m. UTC 
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>
---
 hw/i2c/versatile_i2c.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Richard Henderson Jan. 9, 2023, 5:11 p.m. UTC | #1 
On 1/9/23 01:17, Philippe Mathieu-Daudé wrote:
> 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>
> ---
>   hw/i2c/versatile_i2c.c | 7 +------
>   1 file changed, 1 insertion(+), 6 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~
diff mbox series

Patch

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;