fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2025-12-20 06:40:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux: Remove "usb" subsystem match

Browse source 
The hiddev driver has been in the "usbmisc" subsystem since kernel 3.7.0
or so. As such, we can simply drop the "usb" subsystem from our matches
at this point.
This commit is contained in:
Benjamin Berg 2022-03-29 14:45:07 +02:00
parent 90c25b4fd1
commit 1550d50f20
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/linux/integration-test.py
View file

@ -842,7 +842,7 @@ class Tests(dbusmock.DBusTestCase):
'''UPS properties without AC'''
# add a charging UPS
ups0 = self.testbed.add_device('usb', 'hiddev0', None, [],
ups0 = self.testbed.add_device('usbmisc', 'hiddev0', None, [],
['DEVNAME', 'null', 'UPOWER_VENDOR', 'APC',
'UPOWER_BATTERY_TYPE', 'ups',
'UPOWER_FAKE_DEVICE', '1',
@ -893,7 +893,7 @@ class Tests(dbusmock.DBusTestCase):
'''UPS properties with offline AC'''
# add low charge UPS
ups0 = self.testbed.add_device('usb', 'hiddev0', None, [],
ups0 = self.testbed.add_device('usbmisc', 'hiddev0', None, [],
['DEVNAME', 'null', 'UPOWER_VENDOR', 'APC',
'UPOWER_BATTERY_TYPE', 'ups',
'UPOWER_FAKE_DEVICE', '1',

6
src/linux/up-backend.c
View file

@ -144,7 +144,7 @@ up_backend_device_new (UpBackend *backend, GUdevDevice *native)
/* no valid TTY object */
g_clear_object (&device);
} else if (g_strcmp0 (subsys, "usb") == 0 || g_strcmp0 (subsys, "usbmisc") == 0) {
} else if (g_strcmp0 (subsys, "usbmisc") == 0) {
#ifdef HAVE_IDEVICE
/* see if this is an iDevice */
@ -496,8 +496,8 @@ up_backend_coldplug (UpBackend *backend, UpDaemon *daemon)
GList *devices;
GList *l;
guint i;
const gchar *subsystems_wup[] = {"power_supply", "usb", "usbmisc", "tty", "input", NULL};
const gchar *subsystems[] = {"power_supply", "usb", "usbmisc", "input", NULL};
const gchar *subsystems_wup[] = {"power_supply", "usbmisc", "tty", "input", NULL};
const gchar *subsystems[] = {"power_supply", "usbmisc", "input", NULL};
backend->priv->daemon = g_object_ref (daemon);
backend->priv->device_list = up_daemon_get_device_list (daemon);