[PATCH 2/3] simauth: remove driver code from core simauth atom

[James Prestwood]

---
 src/sim-auth.c | 49 +++++--------------------------------------------
 1 file changed, 5 insertions(+), 44 deletions(-)

diff --git a/src/sim-auth.c b/src/sim-auth.c
index f5ae7b6..b2c205d 100644
--- a/src/sim-auth.c
+++ b/src/sim-auth.c
@@ -39,8 +39,6 @@
 
 #define SIM_AUTH_MAX_RANDS     3
 
-static GSList *g_drivers = NULL;
-
 /*
  * Temporary handle used for the command authentication sequence.
  */
@@ -136,25 +134,6 @@ static void free_apps(struct ofono_sim_auth *sa)
        g_slist_free(sa->aid_objects);
 }
 
-int ofono_sim_auth_driver_register(const struct ofono_sim_auth_driver *d)
-{
-       DBG("driver: %p, name: %s", d, d->name);
-
-       if (d->probe == NULL)
-               return -EINVAL;
-
-       g_drivers = g_slist_prepend(g_drivers, (void *) d);
-
-       return 0;
-}
-
-void ofono_sim_auth_driver_unregister(const struct ofono_sim_auth_driver *d)
-{
-       DBG("driver: %p, name: %s", d, d->name);
-
-       g_drivers = g_slist_remove(g_drivers, (void *) d);
-}
-
 static void sim_auth_unregister(struct ofono_atom *atom)
 {
        struct ofono_sim_auth *sa = __ofono_atom_get_data(atom);
@@ -173,21 +152,14 @@ static void sim_auth_remove(struct ofono_atom *atom)
        if (sa == NULL)
                return;
 
-       if (sa->driver && sa->driver->remove)
-               sa->driver->remove(sa);
-
        g_free(sa);
 }
 
-struct ofono_sim_auth *ofono_sim_auth_create(struct ofono_modem *modem,
-                                               unsigned int vendor,
-                                               const char *driver, void *data)
+static void sim_auth_register(struct ofono_sim_auth *sa);
+
+struct ofono_sim_auth *ofono_sim_auth_create(struct ofono_modem *modem)
 {
        struct ofono_sim_auth *sa;
-       GSList *l;
-
-       if (driver == NULL)
-               return NULL;
 
        sa = g_new0(struct ofono_sim_auth, 1);
 
@@ -197,18 +169,7 @@ struct ofono_sim_auth *ofono_sim_auth_create(struct 
ofono_modem *modem,
        sa->atom = __ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_SIM_AUTH,
                                                sim_auth_remove, sa);
 
-       for (l = g_drivers; l; l = l->next) {
-               const struct ofono_sim_auth_driver *drv = l->data;
-
-               if (g_strcmp0(drv->name, driver))
-                       continue;
-
-               if (drv->probe(sa, vendor, data) < 0)
-                       continue;
-
-               sa->driver = drv;
-               break;
-       }
+       sim_auth_register(sa);
 
        return sa;
 }
@@ -725,7 +686,7 @@ static char *build_nai(const char *imsi)
        return nai;
 }
 
-void ofono_sim_auth_register(struct ofono_sim_auth *sa)
+static void sim_auth_register(struct ofono_sim_auth *sa)
 {
        DBusConnection *conn = ofono_dbus_get_connection();
        const char *path = __ofono_atom_get_path(sa->atom);
-- 
2.7.4

_______________________________________________
ofono mailing list
ofono@ofono.org
https://lists.ofono.org/mailman/listinfo/ofono