1 files changed, 31 insertions, 42 deletions

diff --git a/plugins/nokia/mm-plugin-nokia.c b/plugins/nokia/mm-plugin-nokia.c
index 7aa102b0..56b649bd 100644
--- a/plugins/nokia/mm-plugin-nokia.c
+++ b/plugins/nokia/mm-plugin-nokia.c
@@ -12,7 +12,7 @@
  *
  * Copyright (C) 2008 - 2009 Novell, Inc.
  * Copyright (C) 2009 - 2011 Red Hat, Inc.
- * Copyright (C) 2011 Google, Inc.
+ * Copyright (C) 2011 - 2012 Google, Inc.
  */
 
 #include <string.h>
@@ -42,38 +42,40 @@ static const MMPortProbeAtCommand custom_init[] = {
 /*****************************************************************************/
 
 static MMBaseModem *
+create_modem (MMPluginBase *plugin,
+              const gchar *sysfs_path,
+              const gchar *driver,
+              guint16 vendor,
+              guint16 product,
+              GList *probes,
+              GError **error)
+{
+    return MM_BASE_MODEM (mm_broadband_modem_nokia_new (sysfs_path,
+                                                        driver,
+                                                        mm_plugin_get_name (MM_PLUGIN (plugin)),
+                                                        vendor,
+                                                        product));
+}
+
+static gboolean
 grab_port (MMPluginBase *base,
-           MMBaseModem *existing,
+           MMBaseModem *modem,
            MMPortProbe *probe,
            GError **error)
 {
-    MMBaseModem *modem = NULL;
     GUdevDevice *port;
-    const gchar *name, *subsys, *driver;
-    guint16 vendor = 0, product = 0;
     MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
 
-    /* The Nokia plugin cannot do anything with non-AT ports */
+    /* The Nokia plugin cannot do anything with non-AT */
     if (!mm_port_probe_is_at (probe)) {
-        g_set_error_literal (error,
-                             MM_CORE_ERROR,
-                             MM_CORE_ERROR_UNSUPPORTED,
-                             "Ignoring non-AT port");
-        return NULL;
+        g_set_error (error,
+                     MM_CORE_ERROR,
+                     MM_CORE_ERROR_UNSUPPORTED,
+                     "Ignoring non-AT port");
+        return FALSE;
     }
 
     port = mm_port_probe_get_port (probe); /* transfer none */
-    subsys = mm_port_probe_get_port_subsys (probe);
-    name = mm_port_probe_get_port_name (probe);
-    driver = mm_port_probe_get_port_driver (probe);
-
-    if (!mm_plugin_base_get_device_ids (base, subsys, name, &vendor, &product)) {
-        g_set_error_literal (error,
-                             MM_CORE_ERROR,
-                             MM_CORE_ERROR_FAILED,
-                             "Could not get modem product ID");
-        return NULL;
-    }
 
     /* Look for port type hints */
     if (g_udev_device_get_property_as_boolean (port, "ID_MM_NOKIA_PORT_TYPE_MODEM"))
@@ -81,26 +83,12 @@ grab_port (MMPluginBase *base,
     else if (g_udev_device_get_property_as_boolean (port, "ID_MM_NOKIA_PORT_TYPE_AUX"))
         pflags = MM_AT_PORT_FLAG_SECONDARY;
 
-    /* If this is the first port being grabbed, create a new modem object */
-    if (!existing)
-        modem = MM_BASE_MODEM (mm_broadband_modem_nokia_new (mm_port_probe_get_port_physdev (probe),
-                                                             driver,
-                                                             mm_plugin_get_name (MM_PLUGIN (base)),
-                                                             vendor,
-                                                             product));
-
-    if (!mm_base_modem_grab_port (existing ? existing : modem,
-                                  subsys,
-                                  name,
-                                  MM_PORT_TYPE_AT, /* we only allow AT ports here */
-                                  pflags,
-                                  error)) {
-        if (modem)
-            g_object_unref (modem);
-        return NULL;
-    }
-
-    return existing ? existing : modem;
+    return mm_base_modem_grab_port (modem,
+                                    mm_port_probe_get_port_subsys (probe),
+                                    mm_port_probe_get_port_name (probe),
+                                    mm_port_probe_get_port_type (probe),
+                                    pflags,
+                                    error);
 }
 
 /*****************************************************************************/
@@ -131,5 +119,6 @@ mm_plugin_nokia_class_init (MMPluginNokiaClass *klass)
 {
     MMPluginBaseClass *pb_class = MM_PLUGIN_BASE_CLASS (klass);
 
+    pb_class->create_modem = create_modem;
     pb_class->grab_port = grab_port;
 }