summaryrefslogtreecommitdiff
path: root/src/linux
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-10-11 09:31:57 +0200
committerBastien Nocera <hadess@hadess.net>2013-10-14 10:42:56 +0200
commit91df125e39c5200b87938ad51d28c1174b17bd1d (patch)
treee1285079413ce4202e629dce80a8a3adcd1ae3c4 /src/linux
parent8c83871f10b363c7080afbc4dca8fb7841edf42a (diff)
downloadupower-91df125e39c5200b87938ad51d28c1174b17bd1d.tar.gz
daemon: Remove unneeded reset of priv struct members
It's already done by GObject.
Diffstat (limited to 'src/linux')
-rw-r--r--src/linux/hidpp-device.c3
-rw-r--r--src/linux/up-backend.c2
-rw-r--r--src/linux/up-device-csr.c2
-rw-r--r--src/linux/up-device-supply.c3
-rw-r--r--src/linux/up-device-unifying.c1
-rw-r--r--src/linux/up-input.c2
6 files changed, 0 insertions, 13 deletions
diff --git a/src/linux/hidpp-device.c b/src/linux/hidpp-device.c
index 24a095c..19a0ae6 100644
--- a/src/linux/hidpp-device.c
+++ b/src/linux/hidpp-device.c
@@ -1023,13 +1023,10 @@ hidpp_device_init (HidppDevice *device)
HidppDeviceMap *map;
device->priv = HIDPP_DEVICE_GET_PRIVATE (device);
- device->priv->is_present = FALSE;
device->priv->fd = -1;
device->priv->feature_index = g_ptr_array_new_with_free_func (g_free);
device->priv->batt_status = HIDPP_DEVICE_BATT_STATUS_UNKNOWN;
- device->priv->batt_is_approx = FALSE;
device->priv->kind = HIDPP_DEVICE_KIND_UNKNOWN;
- device->priv->serial = NULL;
device->priv->lux = -1;
/* add known root */
diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
index da76523..41f6033 100644
--- a/src/linux/up-backend.c
+++ b/src/linux/up-backend.c
@@ -382,8 +382,6 @@ up_backend_init (UpBackend *backend)
{
backend->priv = UP_BACKEND_GET_PRIVATE (backend);
backend->priv->config = up_config_new ();
- backend->priv->daemon = NULL;
- backend->priv->device_list = NULL;
backend->priv->managed_devices = up_device_list_new ();
}
diff --git a/src/linux/up-device-csr.c b/src/linux/up-device-csr.c
index b39243e..545d5b2 100644
--- a/src/linux/up-device-csr.c
+++ b/src/linux/up-device-csr.c
@@ -301,9 +301,7 @@ up_device_csr_init (UpDeviceCsr *csr)
gint retval;
csr->priv = UP_DEVICE_CSR_GET_PRIVATE (csr);
- csr->priv->is_dual = FALSE;
csr->priv->raw_value = -1;
- csr->priv->poll_timer_id = 0;
retval = libusb_init (&csr->priv->ctx);
if (retval < 0)
g_warning ("could not initialize libusb: %i", retval);
diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c
index 53ab977..c1b046e 100644
--- a/src/linux/up-device-supply.c
+++ b/src/linux/up-device-supply.c
@@ -1057,14 +1057,11 @@ static void
up_device_supply_init (UpDeviceSupply *supply)
{
supply->priv = UP_DEVICE_SUPPLY_GET_PRIVATE (supply);
- supply->priv->unknown_retries = 0;
- supply->priv->poll_timer_id = 0;
supply->priv->enable_poll = TRUE;
/* allocate the stats for the battery charging & discharging */
supply->priv->energy_old = g_new (gdouble, UP_DEVICE_SUPPLY_ENERGY_OLD_LENGTH);
supply->priv->energy_old_timespec = g_new (GTimeVal, UP_DEVICE_SUPPLY_ENERGY_OLD_LENGTH);
- supply->priv->energy_old_first = 0;
supply->priv->shown_invalid_voltage_warning = FALSE;
}
diff --git a/src/linux/up-device-unifying.c b/src/linux/up-device-unifying.c
index 29f28e9..b2a9f12 100644
--- a/src/linux/up-device-unifying.c
+++ b/src/linux/up-device-unifying.c
@@ -312,7 +312,6 @@ static void
up_device_unifying_init (UpDeviceUnifying *unifying)
{
unifying->priv = UP_DEVICE_UNIFYING_GET_PRIVATE (unifying);
- unifying->priv->poll_timer_id = 0;
}
/**
diff --git a/src/linux/up-input.c b/src/linux/up-input.c
index a2b887d..e5accea 100644
--- a/src/linux/up-input.c
+++ b/src/linux/up-input.c
@@ -269,8 +269,6 @@ up_input_init (UpInput *input)
{
input->priv = UP_INPUT_GET_PRIVATE (input);
input->priv->eventfp = -1;
- input->priv->channel = NULL;
- input->priv->daemon = NULL;
}
/**