kerneldevice: remove all unneeded g_return_if_fail() checks

These kind of checks are only useful on public APIs really, there
should be no need to have them in internal code.

1 files changed, 8 insertions, 64 deletions

diff --git a/src/kerneldevice/mm-kernel-device-udev.c b/src/kerneldevice/mm-kernel-device-udev.c
index f07c46bc..8350a339 100644
--- a/src/kerneldevice/mm-kernel-device-udev.c
+++ b/src/kerneldevice/mm-kernel-device-udev.c
@@ -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;
+
+    self = MM_KERNEL_DEVICE_UDEV (_self);
 
-    if (!MM_KERNEL_DEVICE_UDEV (self)->priv->device)
+    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);
@@ -790,10 +735,9 @@ kernel_device_get_global_property_as_int_hex (MMKernelDevice *_self,
 MMKernelDevice *
 mm_kernel_device_udev_new (GUdevDevice *udev_device)
 {
-    GError *error = NULL;
+    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,
@@ -876,8 +820,8 @@ initable_init (GInitable     *initable,
                GError       **error)
 {
     MMKernelDeviceUdev *self = MM_KERNEL_DEVICE_UDEV (initable);
-    const gchar *subsystem;
-    const gchar *name;
+    const gchar        *subsystem;
+    const gchar        *name;
 
     /* When created from a GUdevDevice, we're done */
     if (self->priv->device)