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 ":*".

diff --git a/hwdb.d/60-autosuspend.hwdb b/hwdb.d/60-autosuspend.hwdb
index 8ec9f1fb87213497ad2b56e185d0004206eaea2b..55d3fcc3b082553e5e9bffb7fd596a7207662fcb 100644 (file)
--- a/hwdb.d/60-autosuspend.hwdb
+++ b/hwdb.d/60-autosuspend.hwdb
@@ -5,8 +5,8 @@
 # Match string formats:
 # <subsystem>:<modalias>
 #
-# pci:v<vendor>d<device>:
-# usb:v<vendor>p<product>:
+# pci:v<vendor>d<device>
+# usb:v<vendor>p<product>
 #
 # 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 804964b48d7a85e0f345b7f9b2c95dd4b01e2b8c..9635fb4e4c109721f329855fa26fd5547f23d729 100644 (file)
--- 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 0fee575d0b85421470bec02642d9bef29b54cb0e..1eec776885ba076d149d3a8041a8bab3d5f69cca 100644 (file)
--- 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:<modalias pattern>
+# id-input:modalias:<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 1a91d05bc7acc7e293008015f4a2f99abf55b589..8cb41ec0939bafe1aa8e5194c384d5b1c1a510b0 100644 (file)
--- a/hwdb.d/60-keyboard.hwdb
+++ b/hwdb.d/60-keyboard.hwdb
@@ -47,8 +47,6 @@
 #    /sys/class/input/input?/capabilities/ev" and <vendor> 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 16edca57aae1be9198d61c903254968f71935265..b0d0d084de56ecb8c53bcd8926ad57e3ade5f822 100644 (file)
--- 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 e926898ac8571201865281d2ffd61a743ef22807..9d5c4fc06916e5cd2cb284dd94120d19a2962b84 100644 (file)
--- 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 9cdc2b65557249b41acb93b7df1d33ae7c22399b..b427f21ea54cd21536e69825730c1faff3e7dc13 100644 (file)
--- 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 @@
 #    <vendor> 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 df9ba35a9db482d6d5484261d8d53fb4f3b6a1d0..8194d983587df17f1c8684d5af5fdb4c7acce38b 100644 (file)
--- 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):