From 988736997245730eff4eed00e657b7baa9083201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 3 Nov 2020 14:28:14 +0100 Subject: [PATCH] Partially revert "hwdb: reindent commments and say that "*" should always be trailing" This partially reverts commit 62ad1c6495c098a09b36bb20bb37a9b8a11df76f. I kept the reindents and other cosmetic changes, but removed the statements about trailing ":*". --- hwdb.d/60-autosuspend.hwdb | 6 ++---- hwdb.d/60-evdev.hwdb | 2 -- hwdb.d/60-input-id.hwdb | 3 +-- hwdb.d/60-keyboard.hwdb | 2 -- hwdb.d/60-sensor.hwdb | 2 -- hwdb.d/70-joystick.hwdb | 2 -- hwdb.d/70-pointingstick.hwdb | 4 +--- hwdb.d/70-touchpad.hwdb | 2 -- 8 files changed, 4 insertions(+), 19 deletions(-) diff --git a/hwdb.d/60-autosuspend.hwdb b/hwdb.d/60-autosuspend.hwdb index 8ec9f1fb87..55d3fcc3b0 100644 --- a/hwdb.d/60-autosuspend.hwdb +++ b/hwdb.d/60-autosuspend.hwdb @@ -5,8 +5,8 @@ # Match string formats: # : # -# pci:vd: -# usb:vp: +# pci:vd +# usb:vp # # To add local entries, create a new file # /etc/udev/hwdb.d/61-autosuspend-local.hwdb @@ -24,8 +24,6 @@ # # Allowed properties are: # ID_AUTOSUSPEND=1 -# -# All matches should end in ':*' to allow future expansions of the match key. # Sort by brand, model diff --git a/hwdb.d/60-evdev.hwdb b/hwdb.d/60-evdev.hwdb index 804964b48d..9635fb4e4c 100644 --- a/hwdb.d/60-evdev.hwdb +++ b/hwdb.d/60-evdev.hwdb @@ -35,8 +35,6 @@ # the struct input_absinfo as listed in linux/input.h. If a field is missing # the field will be left as-is. Not all fields need to be present. e.g. ::45 # sets the resolution to 45 units/mm. -# -# All matches should end in ':*' to allow future expansions of the match key. # Sort by brand, model diff --git a/hwdb.d/60-input-id.hwdb b/hwdb.d/60-input-id.hwdb index 0fee575d0b..1eec776885 100644 --- a/hwdb.d/60-input-id.hwdb +++ b/hwdb.d/60-input-id.hwdb @@ -9,7 +9,7 @@ # ABI. # # Match string formats: -# id-input:modalias: +# id-input:modalias: # # To add local entries, create a new file # /etc/udev/hwdb.d/61-input-id-local.hwdb @@ -48,7 +48,6 @@ # NOT allowed in this file are: # ID_INPUT_WIDTH_MM, ID_INPUT_HEIGHT_MM, ID_INPUT_TOUCHPAD_INTEGRATION # -# All matches should end in ':*' to allow future expansions of the match key. # Example: # id-input:modalias:input:b0003v1234pABCD* diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb index 1a91d05bc7..8cb41ec093 100644 --- a/hwdb.d/60-keyboard.hwdb +++ b/hwdb.d/60-keyboard.hwdb @@ -47,8 +47,6 @@ # /sys/class/input/input?/capabilities/ev" and is the # firmware-provided string exported by the kernel DMI modalias, # see /sys/class/dmi/id/modalias -# -# All matches should end in ':*' to allow future expansions of the match key. # ######################### KEY MAPPING ###################################### # diff --git a/hwdb.d/60-sensor.hwdb b/hwdb.d/60-sensor.hwdb index 16edca57aa..b0d0d084de 100644 --- a/hwdb.d/60-sensor.hwdb +++ b/hwdb.d/60-sensor.hwdb @@ -67,8 +67,6 @@ # or 'display'. The default, when unset, is equivalent to: # ACCEL_LOCATION=display # -# All matches should end in ':*' to allow future expansions of the match key. - # Sort by brand, model ######################################### diff --git a/hwdb.d/70-joystick.hwdb b/hwdb.d/70-joystick.hwdb index e926898ac8..9d5c4fc069 100644 --- a/hwdb.d/70-joystick.hwdb +++ b/hwdb.d/70-joystick.hwdb @@ -36,8 +36,6 @@ # # If the property is missing, user-space can assume: # ID_INPUT_JOYSTICK_INTEGRATION=external -# -# All matches should end in ':*' to allow future expansions of the match key. joystick:bluetooth:* ID_INPUT_JOYSTICK_INTEGRATION=external diff --git a/hwdb.d/70-pointingstick.hwdb b/hwdb.d/70-pointingstick.hwdb index 9cdc2b6555..b427f21ea5 100644 --- a/hwdb.d/70-pointingstick.hwdb +++ b/hwdb.d/70-pointingstick.hwdb @@ -13,7 +13,7 @@ # # Supported hardware matches are: # - Generic input devices match: -# evdev:input:bZZZZvYYYYpXXXXeWWWW-VVVV:* +# evdev:input:bZZZZvYYYYpXXXXeWWWW-VVVV # This matches on the kernel modalias of the input-device, mainly: # ZZZZ is the bus-id (see /usr/include/linux/input.h BUS_*), YYYY, XXXX and # WWW are the 4-digit hex uppercase vendor, product and version ID and VVVV @@ -27,8 +27,6 @@ # is the firmware-provided string from the kernel DMI modalias, # see /sys/class/dmi/id/modalias # -# All matches should end in ':*' to allow future expansions of the match key. -# # To add local entries, create a new file # /etc/udev/hwdb.d/71-pointingstick-local.hwdb # and add your rules there. To load the new rules execute (as root): diff --git a/hwdb.d/70-touchpad.hwdb b/hwdb.d/70-touchpad.hwdb index df9ba35a9d..8194d98358 100644 --- a/hwdb.d/70-touchpad.hwdb +++ b/hwdb.d/70-touchpad.hwdb @@ -15,8 +15,6 @@ # # vid/pid as 4-digit hex lowercase vendor/product # -# All matches should end in ':*' to allow future expansions of the match key. -# # To add local entries, create a new file # /etc/udev/hwdb.d/71-touchpad-local.hwdb # and add your rules there. To load the new rules execute (as root):