diff options
| -rw-r--r-- | src/mm-device.c | 4 | ||||
| -rw-r--r-- | src/mm-port-probe.c | 26 | ||||
| -rw-r--r-- | src/mm-port-probe.h | 6 |
3 files changed, 3 insertions, 33 deletions
diff --git a/src/mm-device.c b/src/mm-device.c index 6a947c3a..031b1fb8 100644 --- a/src/mm-device.c +++ b/src/mm-device.c @@ -225,9 +225,7 @@ mm_device_grab_port (MMDevice *self, } /* Create and store new port probe */ - probe = mm_port_probe_new (udev_port, - self->priv->udev_device_path, - self->priv->driver); + probe = mm_port_probe_new (udev_port); self->priv->port_probes = g_list_prepend (self->priv->port_probes, probe); /* Notify about the grabbed port */ diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c index 3f74ea23..b7795f55 100644 --- a/src/mm-port-probe.c +++ b/src/mm-port-probe.c @@ -75,8 +75,6 @@ struct _MMPortProbePrivate { GUdevDevice *port; gchar *subsys; gchar *name; - gchar *physdev_path; - gchar *driver; /* Probing results */ guint32 flags; @@ -995,26 +993,8 @@ mm_port_probe_get_port_subsys (MMPortProbe *self) return self->priv->subsys; } -const gchar * -mm_port_probe_get_port_physdev (MMPortProbe *self) -{ - g_return_val_if_fail (MM_IS_PORT_PROBE (self), NULL); - - return self->priv->physdev_path; -} - -const gchar * -mm_port_probe_get_port_driver (MMPortProbe *self) -{ - g_return_val_if_fail (MM_IS_PORT_PROBE (self), NULL); - - return self->priv->driver; -} - MMPortProbe * -mm_port_probe_new (GUdevDevice *port, - const gchar *physdev_path, - const gchar *driver) +mm_port_probe_new (GUdevDevice *port) { MMPortProbe *self; @@ -1022,8 +1002,6 @@ mm_port_probe_new (GUdevDevice *port, self->priv->port = g_object_ref (port); self->priv->subsys = g_strdup (g_udev_device_get_subsystem (port)); self->priv->name = g_strdup (g_udev_device_get_name (port)); - self->priv->physdev_path = g_strdup (physdev_path); - self->priv->driver = g_strdup (driver); return self; } @@ -1046,8 +1024,6 @@ finalize (GObject *object) g_free (self->priv->subsys); g_free (self->priv->name); - g_free (self->priv->physdev_path); - g_free (self->priv->driver); g_free (self->priv->vendor); g_free (self->priv->product); diff --git a/src/mm-port-probe.h b/src/mm-port-probe.h index 1c5e7455..63ed6d66 100644 --- a/src/mm-port-probe.h +++ b/src/mm-port-probe.h @@ -55,15 +55,11 @@ struct _MMPortProbeClass { GType mm_port_probe_get_type (void); -MMPortProbe *mm_port_probe_new (GUdevDevice *port, - const gchar *physdev_path, - const gchar *driver); +MMPortProbe *mm_port_probe_new (GUdevDevice *port); GUdevDevice *mm_port_probe_peek_port (MMPortProbe *self); const gchar *mm_port_probe_get_port_name (MMPortProbe *self); const gchar *mm_port_probe_get_port_subsys (MMPortProbe *self); -const gchar *mm_port_probe_get_port_physdev (MMPortProbe *self); -const gchar *mm_port_probe_get_port_driver (MMPortProbe *self); /* Probing result setters */ void mm_port_probe_set_result_at (MMPortProbe *self, |