colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port-probe: no need to keep neither physdev path nor driver

Browse Source
This commit is contained in:
Aleksander Morgado
2012-07-10 15:07:36 +02:00
parent a5560bef3d
commit 4a85707b09
3 changed files with 3 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mm-device.c
View File

@@ -225,9 +225,7 @@ mm_device_grab_port (MMDevice *self,
} }
/* Create and store new port probe */ /* Create and store new port probe */
probe = mm_port_probe_new (udev_port, probe = mm_port_probe_new (udev_port);
self->priv->udev_device_path,
self->priv->driver);
self->priv->port_probes = g_list_prepend (self->priv->port_probes, probe); self->priv->port_probes = g_list_prepend (self->priv->port_probes, probe);
/* Notify about the grabbed port */ /* Notify about the grabbed port */

26
src/mm-port-probe.c
View File

@@ -75,8 +75,6 @@ struct _MMPortProbePrivate {
GUdevDevice *port; GUdevDevice *port;
gchar *subsys; gchar *subsys;
gchar *name; gchar *name;
gchar *physdev_path;
gchar *driver;
/* Probing results */ /* Probing results */
guint32 flags; guint32 flags;
@@ -995,26 +993,8 @@ mm_port_probe_get_port_subsys (MMPortProbe *self)
return self->priv->subsys; 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 * MMPortProbe *
mm_port_probe_new (GUdevDevice *port, mm_port_probe_new (GUdevDevice *port)
const gchar *physdev_path,
const gchar *driver)
{ {
MMPortProbe *self; MMPortProbe *self;
@@ -1022,8 +1002,6 @@ mm_port_probe_new (GUdevDevice *port,
self->priv->port = g_object_ref (port); self->priv->port = g_object_ref (port);
self->priv->subsys = g_strdup (g_udev_device_get_subsystem (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->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; return self;
} }
@@ -1046,8 +1024,6 @@ finalize (GObject *object)
g_free (self->priv->subsys); g_free (self->priv->subsys);
g_free (self->priv->name); 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->vendor);
g_free (self->priv->product); g_free (self->priv->product);

6
src/mm-port-probe.h
View File

@@ -55,15 +55,11 @@ struct _MMPortProbeClass {
GType mm_port_probe_get_type (void); GType mm_port_probe_get_type (void);
MMPortProbe *mm_port_probe_new (GUdevDevice *port, MMPortProbe *mm_port_probe_new (GUdevDevice *port);
const gchar *physdev_path,
const gchar *driver);
GUdevDevice *mm_port_probe_peek_port (MMPortProbe *self); 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_name (MMPortProbe *self);
const gchar *mm_port_probe_get_port_subsys (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 */ /* Probing result setters */
void mm_port_probe_set_result_at (MMPortProbe *self, void mm_port_probe_set_result_at (MMPortProbe *self,