diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-07-10 10:44:14 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-08-06 20:06:45 +0200 |
| commit | 7e9d3e4b685f0e92979af2f595be6cd336b5dbd6 (patch) | |
| tree | a40d4618c0f576e20297b880f3bfb6aacc3ee511 | |
| parent | aaa487094e140583c4e652c8f59e38431d77b865 (diff) | |
plugin-base: method to get device IDs doesn't need to be public
Given the new pre-probing filters, the IDs are no longer retrieved by the
plugins.
| -rw-r--r-- | src/mm-plugin-base.c | 16 | ||||
| -rw-r--r-- | src/mm-plugin-base.h | 5 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/mm-plugin-base.c b/src/mm-plugin-base.c index 8a6f365f..1452c4cb 100644 --- a/src/mm-plugin-base.c +++ b/src/mm-plugin-base.c @@ -90,12 +90,12 @@ enum { /*****************************************************************************/ -gboolean -mm_plugin_base_get_device_ids (MMPluginBase *self, - const char *subsys, - const char *name, - guint16 *vendor, - guint16 *product) +static gboolean +get_device_ids (MMPluginBase *self, + const char *subsys, + const char *name, + guint16 *vendor, + guint16 *product) { MMPluginBasePrivate *priv; GUdevDevice *device = NULL, *parent = NULL; @@ -318,7 +318,7 @@ apply_pre_probing_filters (MMPluginBase *self, return TRUE; } - mm_plugin_base_get_device_ids (self, subsys, name, &vendor, &product); + get_device_ids (self, subsys, name, &vendor, &product); /* The plugin may specify that only some vendor IDs are supported. If that * is the case, filter by vendor ID. */ @@ -798,7 +798,7 @@ create_modem (MMPlugin *self, /* Vendor and Product IDs are really optional, we'll just warn if they * cannot get loaded */ - if (!mm_plugin_base_get_device_ids (MM_PLUGIN_BASE (self), subsys, name, &vendor, &product)) + if (!get_device_ids (MM_PLUGIN_BASE (self), subsys, name, &vendor, &product)) mm_warn ("Could not get modem vendor/product ID"); /* Let the plugin create the modem from the port probe results */ diff --git a/src/mm-plugin-base.h b/src/mm-plugin-base.h index c5d9bbad..804f706f 100644 --- a/src/mm-plugin-base.h +++ b/src/mm-plugin-base.h @@ -75,10 +75,5 @@ struct _MMPluginBaseClass { GType mm_plugin_base_get_type (void); -gboolean mm_plugin_base_get_device_ids (MMPluginBase *self, - const char *subsys, - const char *name, - guint16 *vendor, - guint16 *product); #endif /* MM_PLUGIN_BASE_H */ |