From 419234745e1d26965c582c8bad288e0d9b157868 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 22 Jul 2009 14:02:40 +0200
Subject: [PATCH] Remove deprecated and unused network storage callbacks

---
 include/storage.h |  5 ----
 src/connman.h     |  3 ---
 src/device.c      | 12 ---------
 src/element.c     |  2 --
 src/network.c     |  2 --
 src/storage.c     | 79 -------------------------------------------------------
 6 files changed, 103 deletions(-)

diff --git a/include/storage.h b/include/storage.h
index d0e48b1..437d72b 100644
--- a/include/storage.h
+++ b/include/storage.h
@@ -46,13 +46,8 @@ struct connman_storage {
 	int (*global_load) (void);
 	int (*global_save) (void);
 	enum connman_device_type device_type;
-	int (*device_init) (void);
 	int (*device_load) (struct connman_device *device);
 	int (*device_save) (struct connman_device *device);
-	enum connman_network_type network_type;
-	int (*network_init) (struct connman_device *device);
-	int (*network_load) (struct connman_network *network);
-	int (*network_save) (struct connman_network *network);
 	enum connman_service_type service_type;
 	int (*service_load) (struct connman_service *service);
 	int (*service_save) (struct connman_service *service);
diff --git a/src/connman.h b/src/connman.h
index ce286fc..0519ac5 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -137,9 +137,6 @@ int __connman_storage_save_global();
 int __connman_storage_init_device();
 int __connman_storage_load_device(struct connman_device *device);
 int __connman_storage_save_device(struct connman_device *device);
-int __connman_storage_init_network(struct connman_device *device);
-int __connman_storage_load_network(struct connman_network *network);
-int __connman_storage_save_network(struct connman_network *network);
 int __connman_storage_init_service();
 int __connman_storage_load_service(struct connman_service *service);
 int __connman_storage_save_service(struct connman_service *service);
diff --git a/src/device.c b/src/device.c
index 95feeb6..044aef5 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1615,8 +1615,6 @@ int connman_device_add_network(struct connman_device *device,
 
 	__connman_network_set_device(network, device);
 
-	__connman_storage_load_network(network);
-
 	err = connman_element_register((struct connman_element *) network,
 							&device->element);
 	if (err < 0) {
@@ -1702,16 +1700,6 @@ int connman_device_register(struct connman_device *device)
 
 	device->offlinemode = __connman_manager_get_offlinemode();
 
-	switch (device->mode) {
-	case CONNMAN_DEVICE_MODE_UNKNOWN:
-	case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
-		break;
-	case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-	case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-		__connman_storage_init_network(device);
-		break;
-	}
-
 	type = __connman_device_get_service_type(device);
 	__connman_notifier_register(type);
 
diff --git a/src/element.c b/src/element.c
index b4ce9b2..9c68fc1 100644
--- a/src/element.c
+++ b/src/element.c
@@ -1609,8 +1609,6 @@ void __connman_element_start(void)
 
 	__connman_storage_load_global();
 
-	__connman_storage_init_device();
-
 	__connman_connection_init();
 	__connman_ipv4_init();
 	__connman_rfkill_init();
diff --git a/src/network.c b/src/network.c
index 06f1c5a..4567d9a 100644
--- a/src/network.c
+++ b/src/network.c
@@ -212,8 +212,6 @@ static DBusMessage *set_property(DBusConnection *conn,
 	} else
 		return __connman_error_invalid_property(msg);
 
-	__connman_storage_save_network(network);
-
 	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
diff --git a/src/storage.c b/src/storage.c
index 88443f9..34df862 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -168,24 +168,6 @@ int __connman_storage_save_global(void)
 	return -ENOENT;
 }
 
-int __connman_storage_init_device(void)
-{
-	GSList *list;
-
-	DBG("");
-
-	for (list = storage_list; list; list = list->next) {
-		struct connman_storage *storage = list->data;
-
-		if (storage->device_init) {
-			if (storage->device_init() == 0)
-				return 0;
-		}
-	}
-
-	return -ENOENT;
-}
-
 int __connman_storage_load_device(struct connman_device *device)
 {
 	GSList *list;
@@ -222,67 +204,6 @@ int __connman_storage_save_device(struct connman_device *device)
 	return -ENOENT;
 }
 
-int __connman_storage_init_network(struct connman_device *device)
-{
-	GSList *list;
-
-	DBG("device %p", device);
-
-	for (list = storage_list; list; list = list->next) {
-		struct connman_storage *storage = list->data;
-
-		if (storage->network_init) {
-			if (storage->network_init(device) == 0)
-				return 0;
-		}
-	}
-
-	return -ENOENT;
-}
-
-int __connman_storage_load_network(struct connman_network *network)
-{
-	GSList *list;
-
-	DBG("network %p", network);
-
-	for (list = storage_list; list; list = list->next) {
-		struct connman_storage *storage = list->data;
-
-		if (storage->network_load) {
-			if (storage->network_load(network) == 0)
-				return 0;
-		}
-	}
-
-	return -ENOENT;
-}
-
-int __connman_storage_save_network(struct connman_network *network)
-{
-	GSList *list;
-
-	DBG("network %p", network);
-
-	for (list = storage_list; list; list = list->next) {
-		struct connman_storage *storage = list->data;
-
-		if (storage->network_save) {
-			if (storage->network_save(network) == 0)
-				return 0;
-		}
-	}
-
-	return -ENOENT;
-}
-
-int __connman_storage_init_service(void)
-{
-	DBG("");
-
-	return -ENOENT;
-}
-
 int __connman_storage_load_service(struct connman_service *service)
 {
 	GSList *list;
-- 
2.7.4