proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-10 16:27:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vli_usbhub: Set the composite parent at construction time

Browse Source
This commit is contained in:
Richard Hughes 2019-11-25 13:43:14 +00:00
parent 0df243ad44
commit 741e1e5323
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/vli-usbhub/fu-vli-usbhub-i2c-device.c
View File

@ -18,7 +18,6 @@
struct _FuVliUsbhubI2cDevice struct _FuVliUsbhubI2cDevice
{ {
FuDevice parent_instance; FuDevice parent_instance;
FuVliUsbhubDevice *parent;
FuVliUsbhubI2cChip chip; FuVliUsbhubI2cChip chip;
}; };
@ -36,10 +35,10 @@ static gboolean
fu_vli_usbhub_i2c_device_setup (FuDevice *device, GError **error) fu_vli_usbhub_i2c_device_setup (FuDevice *device, GError **error)
{ {
FuVliUsbhubI2cDevice *self = FU_VLI_USBHUB_I2C_DEVICE (device); FuVliUsbhubI2cDevice *self = FU_VLI_USBHUB_I2C_DEVICE (device);
FuVliUsbhubDevice *parent = FU_VLI_USBHUB_DEVICE (fu_device_get_parent (device));
guint8 buf[11] = { 0x0 }; guint8 buf[11] = { 0x0 };
g_autofree gchar *instance_id = NULL; g_autofree gchar *instance_id = NULL;
g_autofree gchar *version = NULL; g_autofree gchar *version = NULL;
g_autoptr(FuVliUsbhubDevice) parent = g_steal_pointer (&self->parent);
/* get versions */ /* get versions */
if (!fu_vli_usbhub_device_i2c_read (parent, if (!fu_vli_usbhub_device_i2c_read (parent,
@ -254,20 +253,10 @@ fu_vli_usbhub_i2c_device_init (FuVliUsbhubI2cDevice *self)
fu_device_set_summary (FU_DEVICE (self), "I²C Dock Management Device"); fu_device_set_summary (FU_DEVICE (self), "I²C Dock Management Device");
} }
static void
fu_vli_usbhub_i2c_device_finalize (GObject *object)
{
FuVliUsbhubI2cDevice *self = FU_VLI_USBHUB_I2C_DEVICE (object);
g_clear_object (&self->parent);
G_OBJECT_CLASS (fu_vli_usbhub_i2c_device_parent_class)->finalize (object);
}
static void static void
fu_vli_usbhub_i2c_device_class_init (FuVliUsbhubI2cDeviceClass *klass) fu_vli_usbhub_i2c_device_class_init (FuVliUsbhubI2cDeviceClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass);
FuDeviceClass *klass_device = FU_DEVICE_CLASS (klass); FuDeviceClass *klass_device = FU_DEVICE_CLASS (klass);
object_class->finalize = fu_vli_usbhub_i2c_device_finalize;
klass_device->to_string = fu_vli_usbhub_i2c_device_to_string; klass_device->to_string = fu_vli_usbhub_i2c_device_to_string;
klass_device->probe = fu_vli_usbhub_i2c_device_probe; klass_device->probe = fu_vli_usbhub_i2c_device_probe;
klass_device->setup = fu_vli_usbhub_i2c_device_setup; klass_device->setup = fu_vli_usbhub_i2c_device_setup;
@ -279,7 +268,8 @@ fu_vli_usbhub_i2c_device_class_init (FuVliUsbhubI2cDeviceClass *klass)
FuDevice * FuDevice *
fu_vli_usbhub_i2c_device_new (FuVliUsbhubDevice *parent) fu_vli_usbhub_i2c_device_new (FuVliUsbhubDevice *parent)
{ {
FuVliUsbhubI2cDevice *self = g_object_new (FU_TYPE_VLI_USBHUB_I2C_DEVICE, NULL); FuVliUsbhubI2cDevice *self = g_object_new (FU_TYPE_VLI_USBHUB_I2C_DEVICE,
self->parent = g_object_ref (parent); "parent", parent,
NULL);
return FU_DEVICE (self); return FU_DEVICE (self);
} }