From dc96829bb5a49216e45e770f249f29e725ce97ad Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Thu, 24 Nov 2016 01:15:39 +0100 Subject: cinterion: no need for private struct The only member in the private network isn't even used. --- plugins/cinterion/mm-broadband-bearer-cinterion.c | 34 ----------------------- plugins/cinterion/mm-broadband-bearer-cinterion.h | 2 -- 2 files changed, 36 deletions(-) diff --git a/plugins/cinterion/mm-broadband-bearer-cinterion.c b/plugins/cinterion/mm-broadband-bearer-cinterion.c index 95da54a05..a1153b928 100644 --- a/plugins/cinterion/mm-broadband-bearer-cinterion.c +++ b/plugins/cinterion/mm-broadband-bearer-cinterion.c @@ -86,14 +86,6 @@ get_usb_interface_config_index (MMPort *data, return -1; } -/*****************************************************************************/ -/* Common enums and structs */ - -struct _MMBroadbandBearerCinterionPrivate { - /* Flag for network-initiated disconnect */ - guint network_disconnect_pending_id; -}; - /*****************************************************************************/ /* Common - Helper Functions*/ @@ -347,10 +339,6 @@ connect_3gpp_context_step (Connect3gppContext *ctx) return; } - /* Network-initiated disconnect should not be outstanding at this point, - * because it interferes with the connect attempt.*/ - g_assert (ctx->self->priv->network_disconnect_pending_id == 0); - switch (ctx->step) { case CONNECT_3GPP_CONTEXT_STEP_FIRST: { MMBearerIpFamily ip_family; @@ -758,19 +746,6 @@ mm_broadband_bearer_cinterion_new_finish (GAsyncResult *res, return MM_BASE_BEARER (bearer); } -static void -dispose (GObject *object) -{ - MMBroadbandBearerCinterion *self = MM_BROADBAND_BEARER_CINTERION (object); - - if (self->priv->network_disconnect_pending_id != 0) { - g_source_remove (self->priv->network_disconnect_pending_id); - self->priv->network_disconnect_pending_id = 0; - } - - G_OBJECT_CLASS (mm_broadband_bearer_cinterion_parent_class)->dispose (object); -} - void mm_broadband_bearer_cinterion_new (MMBroadbandModemCinterion *modem, MMBearerProperties *config, @@ -792,22 +767,13 @@ mm_broadband_bearer_cinterion_new (MMBroadbandModemCinterion *modem, static void mm_broadband_bearer_cinterion_init (MMBroadbandBearerCinterion *self) { - /* Initialize private data */ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - MM_TYPE_BROADBAND_BEARER_CINTERION, - MMBroadbandBearerCinterionPrivate); } static void mm_broadband_bearer_cinterion_class_init (MMBroadbandBearerCinterionClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); MMBroadbandBearerClass *broadband_bearer_class = MM_BROADBAND_BEARER_CLASS (klass); - g_type_class_add_private (object_class, sizeof (MMBroadbandBearerCinterionPrivate)); - - object_class->dispose = dispose; - broadband_bearer_class->connect_3gpp = connect_3gpp; broadband_bearer_class->connect_3gpp_finish = connect_3gpp_finish; broadband_bearer_class->disconnect_3gpp = disconnect_3gpp; diff --git a/plugins/cinterion/mm-broadband-bearer-cinterion.h b/plugins/cinterion/mm-broadband-bearer-cinterion.h index 01d360599..fb2ac6be6 100644 --- a/plugins/cinterion/mm-broadband-bearer-cinterion.h +++ b/plugins/cinterion/mm-broadband-bearer-cinterion.h @@ -32,11 +32,9 @@ typedef struct _MMBroadbandBearerCinterion MMBroadbandBearerCinterion; typedef struct _MMBroadbandBearerCinterionClass MMBroadbandBearerCinterionClass; -typedef struct _MMBroadbandBearerCinterionPrivate MMBroadbandBearerCinterionPrivate; struct _MMBroadbandBearerCinterion { MMBroadbandBearer parent; - MMBroadbandBearerCinterionPrivate *priv; }; struct _MMBroadbandBearerCinterionClass { -- cgit v1.2.1