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

kerneldevice: remove all unneeded g_return_if_fail() checks

Browse Source 
These kind of checks are only useful on public APIs really, there
should be no need to have them in internal code.
This commit is contained in:
Aleksander Morgado
2020-11-03 10:16:11 +01:00
parent 5d150ed23e
commit 1e1fe8fb9c
3 changed files with 8 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/kerneldevice/mm-kernel-device-generic.c
View File

@@ -405,64 +405,48 @@ preload_contents (MMKernelDeviceGeneric *self)
static const gchar *
kernel_device_get_subsystem (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), NULL);
return mm_kernel_event_properties_get_subsystem (MM_KERNEL_DEVICE_GENERIC (self)->priv->properties);
}
static const gchar *
kernel_device_get_name (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), NULL);
return mm_kernel_event_properties_get_name (MM_KERNEL_DEVICE_GENERIC (self)->priv->properties);
}
static const gchar *
kernel_device_get_sysfs_path (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), NULL);
return MM_KERNEL_DEVICE_GENERIC (self)->priv->sysfs_path;
}
static gint
kernel_device_get_interface_class (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), -1);
return (gint) MM_KERNEL_DEVICE_GENERIC (self)->priv->interface_class;
}
static gint
kernel_device_get_interface_subclass (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), -1);
return (gint) MM_KERNEL_DEVICE_GENERIC (self)->priv->interface_subclass;
}
static gint
kernel_device_get_interface_protocol (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), -1);
return (gint) MM_KERNEL_DEVICE_GENERIC (self)->priv->interface_protocol;
}
static const gchar *
kernel_device_get_interface_sysfs_path (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), NULL);
return MM_KERNEL_DEVICE_GENERIC (self)->priv->interface_sysfs_path;
}
static const gchar *
kernel_device_get_interface_description (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), NULL);
return MM_KERNEL_DEVICE_GENERIC (self)->priv->interface_description;
}
@@ -471,8 +455,6 @@ kernel_device_get_physdev_uid (MMKernelDevice *self)
{
const gchar *uid;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), NULL);
/* Prefer the one coming in the properties, if any */
if ((uid = mm_kernel_event_properties_get_uid (MM_KERNEL_DEVICE_GENERIC (self)->priv->properties)) != NULL)
return uid;
@@ -492,64 +474,48 @@ kernel_device_get_physdev_uid (MMKernelDevice *self)
static const gchar *
kernel_device_get_driver (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), NULL);
return MM_KERNEL_DEVICE_GENERIC (self)->priv->driver;
}
static guint16
kernel_device_get_physdev_vid (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), 0);
return MM_KERNEL_DEVICE_GENERIC (self)->priv->physdev_vid;
}
static guint16
kernel_device_get_physdev_pid (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), 0);
return MM_KERNEL_DEVICE_GENERIC (self)->priv->physdev_pid;
}
static guint16
kernel_device_get_physdev_revision (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), 0);
return MM_KERNEL_DEVICE_GENERIC (self)->priv->physdev_revision;
}
static const gchar *
kernel_device_get_physdev_sysfs_path (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), 0);
return MM_KERNEL_DEVICE_GENERIC (self)->priv->physdev_sysfs_path;
}
static const gchar *
kernel_device_get_physdev_subsystem (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), NULL);
return MM_KERNEL_DEVICE_GENERIC (self)->priv->physdev_subsystem;
}
static const gchar *
kernel_device_get_physdev_manufacturer (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), 0);
return MM_KERNEL_DEVICE_GENERIC (self)->priv->physdev_manufacturer;
}
static const gchar *
kernel_device_get_physdev_product (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), 0);
return MM_KERNEL_DEVICE_GENERIC (self)->priv->physdev_product;
}
@@ -557,9 +523,6 @@ static gboolean
kernel_device_cmp (MMKernelDevice *a,
MMKernelDevice *b)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (a), FALSE);
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (b), FALSE);
return (!g_strcmp0 (mm_kernel_device_get_subsystem (a), mm_kernel_device_get_subsystem (b)) &&
!g_strcmp0 (mm_kernel_device_get_name (a), mm_kernel_device_get_name (b)));
}
@@ -858,8 +821,6 @@ static gboolean
kernel_device_has_property (MMKernelDevice *self,
const gchar *property)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), FALSE);
return !!g_object_get_data (G_OBJECT (self), property);
}
@@ -867,8 +828,6 @@ static const gchar *
kernel_device_get_property (MMKernelDevice *self,
const gchar *property)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), NULL);
return g_object_get_data (G_OBJECT (self), property);
}
@@ -878,8 +837,6 @@ kernel_device_get_property_as_boolean (MMKernelDevice *self,
{
const gchar *value;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), FALSE);
value = g_object_get_data (G_OBJECT (self), property);
return (value && mm_common_get_boolean_from_string (value, NULL));
}
@@ -891,8 +848,6 @@ kernel_device_get_property_as_int (MMKernelDevice *self,
const gchar *value;
gint aux = 0;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), -1);
value = g_object_get_data (G_OBJECT (self), property);
return ((value && mm_get_int_from_str (value, &aux)) ? aux : 0);
}
@@ -904,8 +859,6 @@ kernel_device_get_property_as_int_hex (MMKernelDevice *self,
const gchar *value;
guint aux = 0;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), G_MAXUINT);
value = g_object_get_data (G_OBJECT (self), property);
return ((value && mm_get_uint_from_hex_str (value, &aux)) ? aux : 0);
}
@@ -917,8 +870,6 @@ mm_kernel_device_generic_new_with_rules (MMKernelEventProperties *props,
GArray *rules,
GError **error)
{
g_return_val_if_fail (MM_IS_KERNEL_EVENT_PROPERTIES (props), NULL);
/* Note: we allow NULL rules, e.g. for virtual devices */
return MM_KERNEL_DEVICE (g_initable_new (MM_TYPE_KERNEL_DEVICE_GENERIC,
@@ -935,8 +886,6 @@ mm_kernel_device_generic_new (MMKernelEventProperties *props,
{
static GArray *rules = NULL;
g_return_val_if_fail (MM_IS_KERNEL_EVENT_PROPERTIES (props), NULL);
/* We only try to load the default list of rules once */
if (G_UNLIKELY (!rules)) {
rules = mm_kernel_device_generic_rules_load (UDEVRULESDIR, error);

66
src/kerneldevice/mm-kernel-device-udev.c
View File

@@ -191,8 +191,6 @@ find_physical_gudevdevice (GUdevDevice *child)
guint32 i = 0;
gboolean is_usb = FALSE, is_pcmcia = FALSE;
g_return_val_if_fail (child != NULL, NULL);
/* Bluetooth rfcomm devices are "virtual" and don't necessarily have
* parents at all.
*/
@@ -306,8 +304,6 @@ kernel_device_get_subsystem (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), NULL);
self = MM_KERNEL_DEVICE_UDEV (_self);
if (self->priv->device)
@@ -322,8 +318,6 @@ kernel_device_get_name (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), NULL);
self = MM_KERNEL_DEVICE_UDEV (_self);
if (self->priv->device)
@@ -339,8 +333,6 @@ kernel_device_get_driver (MMKernelDevice *_self)
MMKernelDeviceUdev *self;
const gchar *driver, *subsys, *name;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), NULL);
self = MM_KERNEL_DEVICE_UDEV (_self);
if (!self->priv->device)
@@ -379,11 +371,13 @@ kernel_device_get_driver (MMKernelDevice *_self)
}
static const gchar *
kernel_device_get_sysfs_path (MMKernelDevice *self)
kernel_device_get_sysfs_path (MMKernelDevice *_self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
MMKernelDeviceUdev *self;
if (!MM_KERNEL_DEVICE_UDEV (self)->priv->device)
self = MM_KERNEL_DEVICE_UDEV (_self);
if (!self->priv->device)
return NULL;
return g_udev_device_get_sysfs_path (MM_KERNEL_DEVICE_UDEV (self)->priv->device);
@@ -395,8 +389,6 @@ kernel_device_get_physdev_uid (MMKernelDevice *_self)
MMKernelDeviceUdev *self;
const gchar *uid = NULL;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), NULL);
self = MM_KERNEL_DEVICE_UDEV (_self);
/* Prefer the one coming in the properties, if any */
@@ -423,8 +415,6 @@ kernel_device_get_physdev_vid (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), 0);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_device_ids (self);
return self->priv->vendor;
@@ -435,8 +425,6 @@ kernel_device_get_physdev_pid (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), 0);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_device_ids (self);
return self->priv->product;
@@ -447,8 +435,6 @@ kernel_device_get_physdev_revision (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), 0);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_device_ids (self);
return self->priv->revision;
@@ -459,8 +445,6 @@ kernel_device_get_physdev_sysfs_path (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), NULL);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_physdev (self);
if (!self->priv->physdev)
@@ -474,8 +458,6 @@ kernel_device_get_physdev_subsystem (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), NULL);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_physdev (self);
if (!self->priv->physdev)
@@ -489,8 +471,6 @@ kernel_device_get_physdev_manufacturer (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), NULL);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_physdev (self);
if (!self->priv->physdev)
@@ -504,8 +484,6 @@ kernel_device_get_physdev_product (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), NULL);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_physdev (self);
if (!self->priv->physdev)
@@ -519,8 +497,6 @@ kernel_device_get_interface_class (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), -1);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_interface (self);
return (self->priv->interface ? g_udev_device_get_sysfs_attr_as_int (self->priv->interface, "bInterfaceClass") : -1);
@@ -531,8 +507,6 @@ kernel_device_get_interface_subclass (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), -1);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_interface (self);
return (self->priv->interface ? g_udev_device_get_sysfs_attr_as_int (self->priv->interface, "bInterfaceSubClass") : -1);
@@ -543,8 +517,6 @@ kernel_device_get_interface_protocol (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), -1);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_interface (self);
return (self->priv->interface ? g_udev_device_get_sysfs_attr_as_int (self->priv->interface, "bInterfaceProtocol") : -1);
@@ -555,8 +527,6 @@ kernel_device_get_interface_sysfs_path (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), NULL);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_interface (self);
return (self->priv->interface ? g_udev_device_get_sysfs_path (self->priv->interface) : NULL);
@@ -567,8 +537,6 @@ kernel_device_get_interface_description (MMKernelDevice *_self)
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), NULL);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_interface (self);
return (self->priv->interface ? g_udev_device_get_sysfs_attr (self->priv->interface, "interface") : NULL);
@@ -581,9 +549,6 @@ kernel_device_cmp (MMKernelDevice *_a,
MMKernelDeviceUdev *a;
MMKernelDeviceUdev *b;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_a), FALSE);
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_b), FALSE);
a = MM_KERNEL_DEVICE_UDEV (_a);
b = MM_KERNEL_DEVICE_UDEV (_b);
@@ -611,8 +576,6 @@ kernel_device_has_property (MMKernelDevice *_self,
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), FALSE);
self = MM_KERNEL_DEVICE_UDEV (_self);
if (!self->priv->device)
@@ -627,8 +590,6 @@ kernel_device_get_property (MMKernelDevice *_self,
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), NULL);
self = MM_KERNEL_DEVICE_UDEV (_self);
if (!self->priv->device)
@@ -643,8 +604,6 @@ kernel_device_get_property_as_boolean (MMKernelDevice *_self,
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), FALSE);
self = MM_KERNEL_DEVICE_UDEV (_self);
if (!self->priv->device)
@@ -659,8 +618,6 @@ kernel_device_get_property_as_int (MMKernelDevice *_self,
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), -1);
self = MM_KERNEL_DEVICE_UDEV (_self);
if (!self->priv->device)
@@ -677,8 +634,6 @@ kernel_device_get_property_as_int_hex (MMKernelDevice *_self,
const gchar *s;
guint out = 0;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), G_MAXUINT);
self = MM_KERNEL_DEVICE_UDEV (_self);
if (!self->priv->device)
@@ -694,8 +649,6 @@ kernel_device_has_global_property (MMKernelDevice *_self,
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), FALSE);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_physdev (self);
@@ -712,8 +665,6 @@ kernel_device_get_global_property (MMKernelDevice *_self,
MMKernelDeviceUdev *self;
const gchar *str;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), NULL);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_physdev (self);
@@ -731,8 +682,6 @@ kernel_device_get_global_property_as_boolean (MMKernelDevice *_self,
{
MMKernelDeviceUdev *self;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), FALSE);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_physdev (self);
@@ -751,8 +700,6 @@ kernel_device_get_global_property_as_int (MMKernelDevice *_self,
MMKernelDeviceUdev *self;
gint value;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), -1);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_physdev (self);
@@ -772,8 +719,6 @@ kernel_device_get_global_property_as_int_hex (MMKernelDevice *_self,
const gchar *s;
guint out = 0;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), G_MAXUINT);
self = MM_KERNEL_DEVICE_UDEV (_self);
ensure_physdev (self);
@@ -793,7 +738,6 @@ mm_kernel_device_udev_new (GUdevDevice *udev_device)
GError *error = NULL;
MMKernelDevice *self;
g_return_val_if_fail (G_UDEV_IS_DEVICE (udev_device), NULL);
self = MM_KERNEL_DEVICE (g_initable_new (MM_TYPE_KERNEL_DEVICE_UDEV,
NULL,

57
src/kerneldevice/mm-kernel-device.c
View File

@@ -29,8 +29,6 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (MMKernelDevice, mm_kernel_device, G_TYPE_OBJEC
const gchar *
mm_kernel_device_get_subsystem (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_subsystem ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_subsystem (self) :
NULL);
@@ -39,8 +37,6 @@ mm_kernel_device_get_subsystem (MMKernelDevice *self)
const gchar *
mm_kernel_device_get_name (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_name ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_name (self) :
NULL);
@@ -49,8 +45,6 @@ mm_kernel_device_get_name (MMKernelDevice *self)
const gchar *
mm_kernel_device_get_driver (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_driver ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_driver (self) :
NULL);
@@ -59,8 +53,6 @@ mm_kernel_device_get_driver (MMKernelDevice *self)
const gchar *
mm_kernel_device_get_sysfs_path (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_sysfs_path ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_sysfs_path (self) :
NULL);
@@ -69,8 +61,6 @@ mm_kernel_device_get_sysfs_path (MMKernelDevice *self)
const gchar *
mm_kernel_device_get_physdev_uid (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_uid ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_uid (self) :
NULL);
@@ -79,8 +69,6 @@ mm_kernel_device_get_physdev_uid (MMKernelDevice *self)
guint16
mm_kernel_device_get_physdev_vid (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), 0);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_vid ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_vid (self) :
0);
@@ -89,8 +77,6 @@ mm_kernel_device_get_physdev_vid (MMKernelDevice *self)
guint16
mm_kernel_device_get_physdev_pid (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), 0);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_pid ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_pid (self) :
0);
@@ -99,8 +85,6 @@ mm_kernel_device_get_physdev_pid (MMKernelDevice *self)
guint16
mm_kernel_device_get_physdev_revision (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), 0);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_revision ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_revision (self) :
0);
@@ -109,8 +93,6 @@ mm_kernel_device_get_physdev_revision (MMKernelDevice *self)
const gchar *
mm_kernel_device_get_physdev_subsystem (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_subsystem ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_subsystem (self) :
NULL);
@@ -119,8 +101,6 @@ mm_kernel_device_get_physdev_subsystem (MMKernelDevice *self)
const gchar *
mm_kernel_device_get_physdev_sysfs_path (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_sysfs_path ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_sysfs_path (self) :
NULL);
@@ -129,8 +109,6 @@ mm_kernel_device_get_physdev_sysfs_path (MMKernelDevice *self)
const gchar *
mm_kernel_device_get_physdev_manufacturer (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_manufacturer ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_manufacturer (self) :
NULL);
@@ -139,8 +117,6 @@ mm_kernel_device_get_physdev_manufacturer (MMKernelDevice *self)
const gchar *
mm_kernel_device_get_physdev_product (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_product ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_physdev_product (self) :
NULL);
@@ -149,8 +125,6 @@ mm_kernel_device_get_physdev_product (MMKernelDevice *self)
gint
mm_kernel_device_get_interface_class (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), -1);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_interface_class ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_interface_class (self) :
-1);
@@ -159,8 +133,6 @@ mm_kernel_device_get_interface_class (MMKernelDevice *self)
gint
mm_kernel_device_get_interface_subclass (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), -1);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_interface_subclass ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_interface_subclass (self) :
-1);
@@ -169,8 +141,6 @@ mm_kernel_device_get_interface_subclass (MMKernelDevice *self)
gint
mm_kernel_device_get_interface_protocol (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), -1);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_interface_protocol ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_interface_protocol (self) :
-1);
@@ -179,8 +149,6 @@ mm_kernel_device_get_interface_protocol (MMKernelDevice *self)
const gchar *
mm_kernel_device_get_interface_sysfs_path (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_interface_sysfs_path ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_interface_sysfs_path (self) :
NULL);
@@ -189,8 +157,6 @@ mm_kernel_device_get_interface_sysfs_path (MMKernelDevice *self)
const gchar *
mm_kernel_device_get_interface_description (MMKernelDevice *self)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_interface_description ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_interface_description (self) :
NULL);
@@ -200,9 +166,6 @@ gboolean
mm_kernel_device_cmp (MMKernelDevice *a,
MMKernelDevice *b)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (a), FALSE);
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (b), FALSE);
if (G_OBJECT_TYPE (a) != G_OBJECT_TYPE (b))
return FALSE;
@@ -215,8 +178,6 @@ gboolean
mm_kernel_device_has_property (MMKernelDevice *self,
const gchar *property)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), FALSE);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->has_property ?
MM_KERNEL_DEVICE_GET_CLASS (self)->has_property (self, property) :
FALSE);
@@ -226,8 +187,6 @@ const gchar *
mm_kernel_device_get_property (MMKernelDevice *self,
const gchar *property)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_property ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_property (self, property) :
NULL);
@@ -237,8 +196,6 @@ gboolean
mm_kernel_device_get_property_as_boolean (MMKernelDevice *self,
const gchar *property)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), FALSE);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_property_as_boolean ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_property_as_boolean (self, property) :
FALSE);
@@ -248,8 +205,6 @@ gint
mm_kernel_device_get_property_as_int (MMKernelDevice *self,
const gchar *property)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), -1);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_property_as_int ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_property_as_int (self, property) :
-1);
@@ -259,8 +214,6 @@ guint
mm_kernel_device_get_property_as_int_hex (MMKernelDevice *self,
const gchar *property)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), 0);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_property_as_int_hex ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_property_as_int_hex (self, property) :
0);
@@ -270,8 +223,6 @@ gboolean
mm_kernel_device_has_global_property (MMKernelDevice *self,
const gchar *property)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), FALSE);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->has_global_property ?
MM_KERNEL_DEVICE_GET_CLASS (self)->has_global_property (self, property) :
FALSE);
@@ -281,8 +232,6 @@ const gchar *
mm_kernel_device_get_global_property (MMKernelDevice *self,
const gchar *property)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), NULL);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_global_property ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_global_property (self, property) :
NULL);
@@ -292,8 +241,6 @@ gboolean
mm_kernel_device_get_global_property_as_boolean (MMKernelDevice *self,
const gchar *property)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), FALSE);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_global_property_as_boolean ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_global_property_as_boolean (self, property) :
FALSE);
@@ -303,8 +250,6 @@ gint
mm_kernel_device_get_global_property_as_int (MMKernelDevice *self,
const gchar *property)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), -1);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_global_property_as_int ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_global_property_as_int (self, property) :
-1);
@@ -314,8 +259,6 @@ guint
mm_kernel_device_get_global_property_as_int_hex (MMKernelDevice *self,
const gchar *property)
{
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (self), 0);
return (MM_KERNEL_DEVICE_GET_CLASS (self)->get_global_property_as_int_hex ?
MM_KERNEL_DEVICE_GET_CLASS (self)->get_global_property_as_int_hex (self, property) :
0);