From f10065d03c3b9e8543244f1f35e71044795a8a2c Mon Sep 17 00:00:00 2001 From: Ben Chan Date: Thu, 23 Feb 2017 11:45:29 -0800 Subject: kernel-device: simplify handling of platform/pci/pnp/sdio parent This patch simplifies the handling of platform/pci/pnp/sdio device in find_physical_gudevdevice(). When the code finds the first parent device under the subsystem 'platform', 'pci', 'pnp', or 'sdio', it stops traversing up the device tree, so there is no need to keep track of whether a platform / pci / pnp / sdio device has previously been visited via those is_platform/is_pci/is_pnp/is_sdio Boolean variables. --- src/kerneldevice/mm-kernel-device-udev.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'src/kerneldevice/mm-kernel-device-udev.c') diff --git a/src/kerneldevice/mm-kernel-device-udev.c b/src/kerneldevice/mm-kernel-device-udev.c index 763ccf86..ab75aa34 100644 --- a/src/kerneldevice/mm-kernel-device-udev.c +++ b/src/kerneldevice/mm-kernel-device-udev.c @@ -177,8 +177,7 @@ find_physical_gudevdevice (GUdevDevice *child) GUdevDevice *physdev = NULL; const char *subsys, *type, *name; guint32 i = 0; - gboolean is_usb = FALSE, is_pci = FALSE, is_pcmcia = FALSE, is_platform = FALSE; - gboolean is_pnp = FALSE, is_sdio = FALSE; + gboolean is_usb = FALSE, is_pcmcia = FALSE; g_return_val_if_fail (child != NULL, NULL); @@ -220,21 +219,11 @@ find_physical_gudevdevice (GUdevDevice *child) if (physdev) break; } - } else if (is_platform || !strcmp (subsys, "platform")) { - /* Take the first platform parent as the physical device */ - is_platform = TRUE; - physdev = iter; - break; - } else if (is_pci || !strcmp (subsys, "pci")) { - is_pci = TRUE; - physdev = iter; - break; - } else if (is_pnp || !strcmp (subsys, "pnp")) { - is_pnp = TRUE; - physdev = iter; - break; - } else if (is_sdio || !strcmp (subsys, "sdio")) { - is_sdio = TRUE; + } else if (!strcmp (subsys, "platform") || + !strcmp (subsys, "pci") || + !strcmp (subsys, "pnp") || + !strcmp (subsys, "sdio")) { + /* Take the first parent as the physical device */ physdev = iter; break; } -- cgit v1.2.3-70-g09d2