diff mbox

[17/32] qdev/prop: convert smbus_eeprom.c to helper macros.

Message ID 1249313748-6459-18-git-send-email-kraxel@redhat.com
State Superseded
Headers show

Commit Message

Gerd Hoffmann Aug. 3, 2009, 3:35 p.m. UTC 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/smbus_eeprom.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)
diff mbox

Patch

diff --git a/hw/smbus_eeprom.c b/hw/smbus_eeprom.c
index c071fb1..9785cc2 100644
--- a/hw/smbus_eeprom.c
+++ b/hw/smbus_eeprom.c
@@ -30,7 +30,7 @@ 
 
 typedef struct SMBusEEPROMDevice {
     SMBusDevice smbusdev;
-    uint8_t *data;
+    void *data;
     uint8_t offset;
 } SMBusEEPROMDevice;
 
@@ -54,7 +54,8 @@  static void eeprom_send_byte(SMBusDevice *dev, uint8_t val)
 static uint8_t eeprom_receive_byte(SMBusDevice *dev)
 {
     SMBusEEPROMDevice *eeprom = (SMBusEEPROMDevice *) dev;
-    uint8_t val = eeprom->data[eeprom->offset++];
+    uint8_t *data = eeprom->data;
+    uint8_t val = data[eeprom->offset++];
 #ifdef DEBUG
     printf("eeprom_receive_byte: addr=0x%02x val=0x%02x\n",
            dev->i2c.address, val);
@@ -106,12 +107,8 @@  static SMBusDeviceInfo smbus_eeprom_info = {
     .i2c.qdev.name = "smbus-eeprom",
     .i2c.qdev.size = sizeof(SMBusEEPROMDevice),
     .i2c.qdev.props = (Property[]) {
-        {
-            .name   = "data",
-            .info   = &qdev_prop_ptr,
-            .offset = offsetof(SMBusEEPROMDevice, data),
-        },
-        {/* end of list */}
+        DEFINE_PROP_PTR("data", SMBusEEPROMDevice, data),
+        DEFINE_PROP_END_OF_LIST(),
     },
     .init = smbus_eeprom_init,
     .quick_cmd = eeprom_quick_cmd,