{
struct barr_data *data = ofono_call_barring_get_data(barr);
- if (data) {
- g_isi_client_destroy(data->client);
- g_free(data);
- }
+ if (!data)
+ return;
+
+ ofono_call_barring_set_data(barr, NULL);
+ g_isi_client_destroy(data->client);
+ g_free(data);
}
static struct ofono_call_barring_driver driver = {
{
struct forw_data *data = ofono_call_forwarding_get_data(cf);
- if (data) {
- g_isi_client_destroy(data->client);
- g_free(data);
- }
+ if (!data)
+ return;
+
+ ofono_call_forwarding_set_data(cf, NULL);
+ g_isi_client_destroy(data->client);
+ g_free(data);
}
static struct ofono_call_forwarding_driver driver = {
{
struct settings_data *data = ofono_call_settings_get_data(cs);
- if (data) {
- g_isi_client_destroy(data->client);
- g_free(data);
- }
+ if (!data)
+ return;
+
+ ofono_call_settings_set_data(cs, NULL);
+ g_isi_client_destroy(data->client);
+ g_free(data);
}
static struct ofono_call_settings_driver driver = {
static void isi_gprs_remove(struct ofono_gprs *gprs)
{
- struct gprs_data *gd = ofono_gprs_get_data(gprs);
-
- ofono_gprs_set_data(gprs, NULL);
+ struct gprs_data *data = ofono_gprs_get_data(gprs);
- if (gd->client)
- g_isi_client_destroy(gd->client);
+ if (!data)
+ return;
- g_free(gd);
+ ofono_gprs_set_data(gprs, NULL);
+ g_isi_client_destroy(data->client);
+ g_free(data);
}
static bool attach_resp_cb(GIsiClient *client, const void *restrict data,
{
struct isi_data *isi = ofono_modem_get_data(modem);
- DBG("(%p) with %s", modem, isi ? isi->ifname : NULL);
-
- if (isi == NULL)
+ if (!isi)
return;
+ ofono_modem_set_data(modem, NULL);
g_isi_client_destroy(isi->client);
g_free(isi);
}
{
struct netreg_data *data = ofono_netreg_get_data(net);
- if (data) {
- g_isi_client_destroy(data->client);
- g_free(data);
- }
+ if (!data)
+ return;
+
+ ofono_netreg_set_data(net, NULL);
+ g_isi_client_destroy(data->client);
+ g_free(data);
}
static struct ofono_netreg_driver driver = {
{
struct sim_data *data = ofono_sim_get_data(sim);
- if (data) {
- g_isi_client_destroy(data->client);
- g_free(data);
- }
+ if (!data)
+ return;
+
+ ofono_sim_set_data(sim, NULL);
+ g_isi_client_destroy(data->client);
+ g_free(data);
}
static struct ofono_sim_driver driver = {
{
struct ussd_data *data = ofono_ussd_get_data(ussd);
- if (data && data->client)
- g_isi_client_destroy(data->client);
+ if (!data)
+ return;
+ ofono_ussd_set_data(ussd, NULL);
+ g_isi_client_destroy(data->client);
g_free(data);
}