Input: wacom - remove field pktlen declaration in the list of devices

pktlen is now overwritten by the driver directly by reading the hid
report descriptor. There is no need to declare it statically.
We also move down the position of the field in the struct so that
we can keep the current declaration of Wacom devices.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: Jason Gerecke <killertofu@gmail.com>
Tested-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

2 files changed, 247 insertions, 269 deletions

diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 1c95ce78d749..15b0132265e3 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -2012,418 +2012,396 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev,
 }
 
 static const struct wacom_features wacom_features_0x00 =
-        { "Wacom Penpartner",     WACOM_PKGLEN_PENPRTN,    5040,  3780,  255,
-          0, PENPARTNER, WACOM_PENPRTN_RES, WACOM_PENPRTN_RES };
+        { "Wacom Penpartner", 5040, 3780, 255, 0,
+          PENPARTNER, WACOM_PENPRTN_RES, WACOM_PENPRTN_RES };
 static const struct wacom_features wacom_features_0x10 =
-        { "Wacom Graphire",       WACOM_PKGLEN_GRAPHIRE,  10206,  7422,  511,
-          63, GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
+        { "Wacom Graphire", 10206, 7422, 511, 63,
+          GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
 static const struct wacom_features wacom_features_0x11 =
-        { "Wacom Graphire2 4x5",  WACOM_PKGLEN_GRAPHIRE,  10206,  7422,  511,
-          63, GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
+        { "Wacom Graphire2 4x5", 10206, 7422, 511, 63,
+          GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
 static const struct wacom_features wacom_features_0x12 =
-        { "Wacom Graphire2 5x7",  WACOM_PKGLEN_GRAPHIRE,  13918, 10206,  511,
-          63, GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
+        { "Wacom Graphire2 5x7", 13918, 10206, 511, 63,
+          GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
 static const struct wacom_features wacom_features_0x13 =
-        { "Wacom Graphire3",      WACOM_PKGLEN_GRAPHIRE,  10208,  7424,  511,
-          63, GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
+        { "Wacom Graphire3", 10208, 7424, 511, 63,
+          GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
 static const struct wacom_features wacom_features_0x14 =
-        { "Wacom Graphire3 6x8",  WACOM_PKGLEN_GRAPHIRE,  16704, 12064,  511,
-          63, GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
+        { "Wacom Graphire3 6x8", 16704, 12064, 511, 63,
+          GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
 static const struct wacom_features wacom_features_0x15 =
-        { "Wacom Graphire4 4x5",  WACOM_PKGLEN_GRAPHIRE,  10208,  7424,  511,
-          63, WACOM_G4, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
+        { "Wacom Graphire4 4x5", 10208, 7424, 511, 63,
+          WACOM_G4, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
 static const struct wacom_features wacom_features_0x16 =
-        { "Wacom Graphire4 6x8",  WACOM_PKGLEN_GRAPHIRE,  16704, 12064,  511,
-          63, WACOM_G4, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
+        { "Wacom Graphire4 6x8", 16704, 12064, 511, 63,
+          WACOM_G4, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
 static const struct wacom_features wacom_features_0x17 =
-        { "Wacom BambooFun 4x5",  WACOM_PKGLEN_BBFUN,     14760,  9225,  511,
-          63, WACOM_MO, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom BambooFun 4x5", 14760, 9225, 511, 63,
+          WACOM_MO, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x18 =
-        { "Wacom BambooFun 6x8",  WACOM_PKGLEN_BBFUN,     21648, 13530,  511,
-          63, WACOM_MO, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom BambooFun 6x8", 21648, 13530, 511, 63,
+          WACOM_MO, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x19 =
-        { "Wacom Bamboo1 Medium", WACOM_PKGLEN_GRAPHIRE,  16704, 12064,  511,
-          63, GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
+        { "Wacom Bamboo1 Medium", 16704, 12064, 511, 63,
+          GRAPHIRE, WACOM_GRAPHIRE_RES, WACOM_GRAPHIRE_RES };
 static const struct wacom_features wacom_features_0x60 =
-        { "Wacom Volito",         WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511,
-          63, GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
+        { "Wacom Volito", 5104, 3712, 511, 63,
+          GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
 static const struct wacom_features wacom_features_0x61 =
-        { "Wacom PenStation2",    WACOM_PKGLEN_GRAPHIRE,   3250,  2320,  255,
-          63, GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
+        { "Wacom PenStation2", 3250, 2320, 255, 63,
+          GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
 static const struct wacom_features wacom_features_0x62 =
-        { "Wacom Volito2 4x5",    WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511,
-          63, GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
+        { "Wacom Volito2 4x5", 5104, 3712, 511, 63,
+          GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
 static const struct wacom_features wacom_features_0x63 =
-        { "Wacom Volito2 2x3",    WACOM_PKGLEN_GRAPHIRE,   3248,  2320,  511,
-          63, GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
+        { "Wacom Volito2 2x3", 3248, 2320, 511, 63,
+          GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
 static const struct wacom_features wacom_features_0x64 =
-        { "Wacom PenPartner2",    WACOM_PKGLEN_GRAPHIRE,   3250,  2320,  511,
-          63, GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
+        { "Wacom PenPartner2", 3250, 2320, 511, 63,
+          GRAPHIRE, WACOM_VOLITO_RES, WACOM_VOLITO_RES };
 static const struct wacom_features wacom_features_0x65 =
-        { "Wacom Bamboo",         WACOM_PKGLEN_BBFUN,     14760,  9225,  511,
-          63, WACOM_MO, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Bamboo", 14760, 9225, 511, 63,
+          WACOM_MO, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x69 =
-        { "Wacom Bamboo1",        WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511,
-          63, GRAPHIRE, WACOM_PENPRTN_RES, WACOM_PENPRTN_RES };
+        { "Wacom Bamboo1", 5104, 3712, 511, 63,
+          GRAPHIRE, WACOM_PENPRTN_RES, WACOM_PENPRTN_RES };
 static const struct wacom_features wacom_features_0x6A =
-        { "Wacom Bamboo1 4x6",    WACOM_PKGLEN_GRAPHIRE,  14760,  9225, 1023,
-          63, GRAPHIRE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Bamboo1 4x6", 14760, 9225, 1023, 63,
+          GRAPHIRE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x6B =
-        { "Wacom Bamboo1 5x8",    WACOM_PKGLEN_GRAPHIRE,  21648, 13530, 1023,
-          63, GRAPHIRE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Bamboo1 5x8", 21648, 13530, 1023, 63,
+          GRAPHIRE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x20 =
-        { "Wacom Intuos 4x5",     WACOM_PKGLEN_INTUOS,    12700, 10600, 1023,
-          31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Intuos 4x5", 12700, 10600, 1023, 31,
+          INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x21 =
-        { "Wacom Intuos 6x8",     WACOM_PKGLEN_INTUOS,    20320, 16240, 1023,
-          31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Intuos 6x8", 20320, 16240, 1023, 31,
+          INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x22 =
-        { "Wacom Intuos 9x12",    WACOM_PKGLEN_INTUOS,    30480, 24060, 1023,
-          31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Intuos 9x12", 30480, 24060, 1023, 31,
+          INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x23 =
-        { "Wacom Intuos 12x12",   WACOM_PKGLEN_INTUOS,    30480, 31680, 1023,
-          31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Intuos 12x12", 30480, 31680, 1023, 31,
+          INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x24 =
-        { "Wacom Intuos 12x18",   WACOM_PKGLEN_INTUOS,    45720, 31680, 1023,
-          31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Intuos 12x18", 45720, 31680, 1023, 31,
+          INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x30 =
-        { "Wacom PL400",          WACOM_PKGLEN_GRAPHIRE,   5408,  4056,  255,
-          0, PL, WACOM_PL_RES, WACOM_PL_RES };
+        { "Wacom PL400", 5408, 4056, 255, 0,
+          PL, WACOM_PL_RES, WACOM_PL_RES };
 static const struct wacom_features wacom_features_0x31 =
-        { "Wacom PL500",          WACOM_PKGLEN_GRAPHIRE,   6144,  4608,  255,
-          0, PL, WACOM_PL_RES, WACOM_PL_RES };
+        { "Wacom PL500", 6144, 4608, 255, 0,
+          PL, WACOM_PL_RES, WACOM_PL_RES };
 static const struct wacom_features wacom_features_0x32 =
-        { "Wacom PL600",          WACOM_PKGLEN_GRAPHIRE,   6126,  4604,  255,
-          0, PL, WACOM_PL_RES, WACOM_PL_RES };
+        { "Wacom PL600", 6126, 4604, 255, 0,
+          PL, WACOM_PL_RES, WACOM_PL_RES };
 static const struct wacom_features wacom_features_0x33 =
-        { "Wacom PL600SX",        WACOM_PKGLEN_GRAPHIRE,   6260,  5016,  255,
-          0, PL, WACOM_PL_RES, WACOM_PL_RES };
+        { "Wacom PL600SX", 6260, 5016, 255, 0,
+          PL, WACOM_PL_RES, WACOM_PL_RES };
 static const struct wacom_features wacom_features_0x34 =
-        { "Wacom PL550",          WACOM_PKGLEN_GRAPHIRE,   6144,  4608,  511,
-          0, PL, WACOM_PL_RES, WACOM_PL_RES };
+        { "Wacom PL550", 6144, 4608, 511, 0,
+          PL, WACOM_PL_RES, WACOM_PL_RES };
 static const struct wacom_features wacom_features_0x35 =
-        { "Wacom PL800",          WACOM_PKGLEN_GRAPHIRE,   7220,  5780,  511,
-          0, PL, WACOM_PL_RES, WACOM_PL_RES };
+        { "Wacom PL800", 7220, 5780, 511, 0,
+          PL, WACOM_PL_RES, WACOM_PL_RES };
 static const struct wacom_features wacom_features_0x37 =
-        { "Wacom PL700",          WACOM_PKGLEN_GRAPHIRE,   6758,  5406,  511,
-          0, PL, WACOM_PL_RES, WACOM_PL_RES };
+        { "Wacom PL700", 6758, 5406, 511, 0,
+          PL, WACOM_PL_RES, WACOM_PL_RES };
 static const struct wacom_features wacom_features_0x38 =
-        { "Wacom PL510",          WACOM_PKGLEN_GRAPHIRE,   6282,  4762,  511,
-          0, PL, WACOM_PL_RES, WACOM_PL_RES };
+        { "Wacom PL510", 6282, 4762, 511, 0,
+          PL, WACOM_PL_RES, WACOM_PL_RES };
 static const struct wacom_features wacom_features_0x39 =
-        { "Wacom DTU710",         WACOM_PKGLEN_GRAPHIRE,  34080, 27660,  511,
-          0, PL, WACOM_PL_RES, WACOM_PL_RES };
+        { "Wacom DTU710", 34080, 27660, 511, 0,
+          PL, WACOM_PL_RES, WACOM_PL_RES };
 static const struct wacom_features wacom_features_0xC4 =
-        { "Wacom DTF521",         WACOM_PKGLEN_GRAPHIRE,   6282,  4762,  511,
-          0, PL, WACOM_PL_RES, WACOM_PL_RES };
+        { "Wacom DTF521", 6282, 4762, 511, 0,
+          PL, WACOM_PL_RES, WACOM_PL_RES };
 static const struct wacom_features wacom_features_0xC0 =
-        { "Wacom DTF720",         WACOM_PKGLEN_GRAPHIRE,   6858,  5506,  511,
-          0, PL, WACOM_PL_RES, WACOM_PL_RES };
+        { "Wacom DTF720", 6858, 5506, 511, 0,
+          PL, WACOM_PL_RES, WACOM_PL_RES };
 static const struct wacom_features wacom_features_0xC2 =
-        { "Wacom DTF720a",        WACOM_PKGLEN_GRAPHIRE,   6858,  5506,  511,
-          0, PL, WACOM_PL_RES, WACOM_PL_RES };
+        { "Wacom DTF720a", 6858, 5506, 511, 0,
+          PL, WACOM_PL_RES, WACOM_PL_RES };
 static const struct wacom_features wacom_features_0x03 =
-        { "Wacom Cintiq Partner", WACOM_PKGLEN_GRAPHIRE,  20480, 15360,  511,
-          0, PTU, WACOM_PL_RES, WACOM_PL_RES };
+        { "Wacom Cintiq Partner", 20480, 15360, 511, 0,
+          PTU, WACOM_PL_RES, WACOM_PL_RES };
 static const struct wacom_features wacom_features_0x41 =
-        { "Wacom Intuos2 4x5",    WACOM_PKGLEN_INTUOS,    12700, 10600, 1023,
-          31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Intuos2 4x5", 12700, 10600, 1023, 31,
+          INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x42 =
-        { "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023,
-          31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Intuos2 6x8", 20320, 16240, 1023, 31,
+          INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x43 =
-        { "Wacom Intuos2 9x12",   WACOM_PKGLEN_INTUOS,    30480, 24060, 1023,
-          31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Intuos2 9x12", 30480, 24060, 1023, 31,
+          INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x44 =
-        { "Wacom Intuos2 12x12",  WACOM_PKGLEN_INTUOS,    30480, 31680, 1023,
-          31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Intuos2 12x12", 30480, 31680, 1023, 31,
+          INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x45 =
-        { "Wacom Intuos2 12x18",  WACOM_PKGLEN_INTUOS,    45720, 31680, 1023,
-          31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Intuos2 12x18", 45720, 31680, 1023, 31,
+          INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xB0 =
-        { "Wacom Intuos3 4x5",    WACOM_PKGLEN_INTUOS,    25400, 20320, 1023,
-          63, INTUOS3S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos3 4x5", 25400, 20320, 1023, 63,
+          INTUOS3S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xB1 =
-        { "Wacom Intuos3 6x8",    WACOM_PKGLEN_INTUOS,    40640, 30480, 1023,
-          63, INTUOS3, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos3 6x8", 40640, 30480, 1023, 63,
+          INTUOS3, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xB2 =
-        { "Wacom Intuos3 9x12",   WACOM_PKGLEN_INTUOS,    60960, 45720, 1023,
-          63, INTUOS3, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos3 9x12", 60960, 45720, 1023, 63,
+          INTUOS3, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xB3 =
-        { "Wacom Intuos3 12x12",  WACOM_PKGLEN_INTUOS,    60960, 60960, 1023,
-          63, INTUOS3L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos3 12x12", 60960, 60960, 1023, 63,
+          INTUOS3L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xB4 =
-        { "Wacom Intuos3 12x19",  WACOM_PKGLEN_INTUOS,    97536, 60960, 1023,
-          63, INTUOS3L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos3 12x19", 97536, 60960, 1023, 63,
+          INTUOS3L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xB5 =
-        { "Wacom Intuos3 6x11",   WACOM_PKGLEN_INTUOS,    54204, 31750, 1023,
-          63, INTUOS3, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos3 6x11", 54204, 31750, 1023, 63,
+          INTUOS3, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xB7 =
-        { "Wacom Intuos3 4x6",    WACOM_PKGLEN_INTUOS,    31496, 19685, 1023,
-          63, INTUOS3S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos3 4x6", 31496, 19685, 1023, 63,
+          INTUOS3S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xB8 =
-        { "Wacom Intuos4 4x6",    WACOM_PKGLEN_INTUOS,    31496, 19685, 2047,
-          63, INTUOS4S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos4 4x6", 31496, 19685, 2047, 63,
+          INTUOS4S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xB9 =
-        { "Wacom Intuos4 6x9",    WACOM_PKGLEN_INTUOS,    44704, 27940, 2047,
-          63, INTUOS4, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos4 6x9", 44704, 27940, 2047, 63,
+          INTUOS4, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xBA =
-        { "Wacom Intuos4 8x13",   WACOM_PKGLEN_INTUOS,    65024, 40640, 2047,
-          63, INTUOS4L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos4 8x13", 65024, 40640, 2047, 63,
+          INTUOS4L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xBB =
-        { "Wacom Intuos4 12x19",  WACOM_PKGLEN_INTUOS,    97536, 60960, 2047,
-          63, INTUOS4L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos4 12x19", 97536, 60960, 2047, 63,
+          INTUOS4L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xBC =
-        { "Wacom Intuos4 WL",     WACOM_PKGLEN_INTUOS,    40640, 25400, 2047,
-          63, INTUOS4, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos4 WL", 40640, 25400, 2047, 63,
+          INTUOS4, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0x26 =
-        { "Wacom Intuos5 touch S", WACOM_PKGLEN_INTUOS,  31496, 19685, 2047,
-          63, INTUOS5S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
-          .touch_max = 16 };
+        { "Wacom Intuos5 touch S", 31496, 19685, 2047, 63,
+          INTUOS5S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .touch_max = 16 };
 static const struct wacom_features wacom_features_0x27 =
-        { "Wacom Intuos5 touch M", WACOM_PKGLEN_INTUOS,  44704, 27940, 2047,
-          63, INTUOS5, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
-          .touch_max = 16 };
+        { "Wacom Intuos5 touch M", 44704, 27940, 2047, 63,
+          INTUOS5, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .touch_max = 16 };
 static const struct wacom_features wacom_features_0x28 =
-        { "Wacom Intuos5 touch L", WACOM_PKGLEN_INTUOS, 65024, 40640, 2047,
-          63, INTUOS5L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
-          .touch_max = 16 };
+        { "Wacom Intuos5 touch L", 65024, 40640, 2047, 63,
+          INTUOS5L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .touch_max = 16 };
 static const struct wacom_features wacom_features_0x29 =
-        { "Wacom Intuos5 S", WACOM_PKGLEN_INTUOS,  31496, 19685, 2047,
-          63, INTUOS5S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos5 S", 31496, 19685, 2047, 63,
+          INTUOS5S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0x2A =
-        { "Wacom Intuos5 M", WACOM_PKGLEN_INTUOS,  44704, 27940, 2047,
-          63, INTUOS5, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Intuos5 M", 44704, 27940, 2047, 63,
+          INTUOS5, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0x314 =
-        { "Wacom Intuos Pro S", WACOM_PKGLEN_INTUOS,  31496, 19685, 2047,
-          63, INTUOSPS, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
-          .touch_max = 16,
+        { "Wacom Intuos Pro S", 31496, 19685, 2047, 63,
+          INTUOSPS, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .touch_max = 16,
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
 static const struct wacom_features wacom_features_0x315 =
-        { "Wacom Intuos Pro M", WACOM_PKGLEN_INTUOS,  44704, 27940, 2047,
-          63, INTUOSPM, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
-          .touch_max = 16,
+        { "Wacom Intuos Pro M", 44704, 27940, 2047, 63,
+          INTUOSPM, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .touch_max = 16,
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
 static const struct wacom_features wacom_features_0x317 =
-        { "Wacom Intuos Pro L", WACOM_PKGLEN_INTUOS,  65024, 40640, 2047,
-          63, INTUOSPL, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
-          .touch_max = 16,
+        { "Wacom Intuos Pro L", 65024, 40640, 2047, 63,
+          INTUOSPL, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .touch_max = 16,
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
 static const struct wacom_features wacom_features_0xF4 =
-        { "Wacom Cintiq 24HD",       WACOM_PKGLEN_INTUOS,   104280, 65400, 2047,
-          63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
+        { "Wacom Cintiq 24HD", 104280, 65400, 2047, 63,
+          WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
 static const struct wacom_features wacom_features_0xF8 =
-        { "Wacom Cintiq 24HD touch", WACOM_PKGLEN_INTUOS,   104280, 65400, 2047, /* Pen */
-          63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
+        { "Wacom Cintiq 24HD touch", 104280, 65400, 2047, 63, /* Pen */
+          WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
           .oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf6 };
 static const struct wacom_features wacom_features_0xF6 =
         { "Wacom Cintiq 24HD touch", .type = WACOM_24HDT, /* Touch */
           .oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf8, .touch_max = 10,
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
 static const struct wacom_features wacom_features_0x3F =
-        { "Wacom Cintiq 21UX",    WACOM_PKGLEN_INTUOS,    87200, 65600, 1023,
-          63, CINTIQ, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Cintiq 21UX", 87200, 65600, 1023, 63,
+          CINTIQ, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xC5 =
-        { "Wacom Cintiq 20WSX",   WACOM_PKGLEN_INTUOS,    86680, 54180, 1023,
-          63, WACOM_BEE, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Cintiq 20WSX", 86680, 54180, 1023, 63,
+          WACOM_BEE, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xC6 =
-        { "Wacom Cintiq 12WX",    WACOM_PKGLEN_INTUOS,    53020, 33440, 1023,
-          63, WACOM_BEE, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+        { "Wacom Cintiq 12WX", 53020, 33440, 1023, 63,
+          WACOM_BEE, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0x304 =
-        { "Wacom Cintiq 13HD",    WACOM_PKGLEN_INTUOS,    59352, 33648, 1023,
-          63, WACOM_13HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
+        { "Wacom Cintiq 13HD", 59352, 33648, 1023, 63,
+          WACOM_13HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
 static const struct wacom_features wacom_features_0xC7 =
-        { "Wacom DTU1931",        WACOM_PKGLEN_GRAPHIRE,  37832, 30305,  511,
-          0, PL, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom DTU1931", 37832, 30305, 511, 0,
+          PL, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xCE =
-        { "Wacom DTU2231",        WACOM_PKGLEN_GRAPHIRE,  47864, 27011,  511,
-          0, DTU, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+        { "Wacom DTU2231", 47864, 27011, 511, 0,
+          DTU, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBMOUSE };
 static const struct wacom_features wacom_features_0xF0 =
-        { "Wacom DTU1631",        WACOM_PKGLEN_GRAPHIRE,  34623, 19553,  511,
-          0, DTU, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom DTU1631", 34623, 19553, 511, 0,
+          DTU, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xFB =
-        { "Wacom DTU1031",        WACOM_PKGLEN_DTUS,      22096, 13960,  511,
-          0, DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom DTU1031", 22096, 13960, 511, 0,
+          DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x57 =
-        { "Wacom DTK2241",        WACOM_PKGLEN_INTUOS,    95640, 54060, 2047,
-          63, DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
+        { "Wacom DTK2241", 95640, 54060, 2047, 63,
+          DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
 static const struct wacom_features wacom_features_0x59 = /* Pen */
-        { "Wacom DTH2242",        WACOM_PKGLEN_INTUOS,    95640, 54060, 2047,
-          63, DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
+        { "Wacom DTH2242", 95640, 54060, 2047, 63,
+          DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
           .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5D };
 static const struct wacom_features wacom_features_0x5D = /* Touch */
         { "Wacom DTH2242",       .type = WACOM_24HDT,
           .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x59, .touch_max = 10,
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
 static const struct wacom_features wacom_features_0xCC =
-        { "Wacom Cintiq 21UX2",   WACOM_PKGLEN_INTUOS,    87000, 65400, 2047,
-          63, WACOM_21UX2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
+        { "Wacom Cintiq 21UX2", 87000, 65400, 2047, 63,
+          WACOM_21UX2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
 static const struct wacom_features wacom_features_0xFA =
-        { "Wacom Cintiq 22HD",    WACOM_PKGLEN_INTUOS,    95640, 54060, 2047,
-          63, WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
+        { "Wacom Cintiq 22HD", 95640, 54060, 2047, 63,
+          WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
 static const struct wacom_features wacom_features_0x5B =
-        { "Wacom Cintiq 22HDT", WACOM_PKGLEN_INTUOS,      95640, 54060, 2047,
-          63, WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
+        { "Wacom Cintiq 22HDT", 95640, 54060, 2047, 63,
+          WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
           .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5e };
 static const struct wacom_features wacom_features_0x5E =
         { "Wacom Cintiq 22HDT", .type = WACOM_24HDT,
           .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5b, .touch_max = 10,
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
 static const struct wacom_features wacom_features_0x90 =
-        { "Wacom ISDv4 90",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,
-          0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 90", 26202, 16325, 255, 0,
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x93 =
-        { "Wacom ISDv4 93",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,
-          0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 93", 26202, 16325, 255, 0,
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x97 =
-        { "Wacom ISDv4 97",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  511,
-          0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 97", 26202, 16325, 511, 0,
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x9A =
-        { "Wacom ISDv4 9A",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,
-          0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 9A", 26202, 16325, 255, 0,
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x9F =
-        { "Wacom ISDv4 9F",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,
-          0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 9F", 26202, 16325, 255, 0,
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xE2 =
-        { "Wacom ISDv4 E2",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,
-          0, TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 2 };
+        { "Wacom ISDv4 E2", 26202, 16325, 255, 0,
+          TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
 static const struct wacom_features wacom_features_0xE3 =
-        { "Wacom ISDv4 E3",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,
-          0, TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 2 };
+        { "Wacom ISDv4 E3", 26202, 16325, 255, 0,
+          TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
 static const struct wacom_features wacom_features_0xE5 =
-        { "Wacom ISDv4 E5",       WACOM_PKGLEN_MTOUCH,    26202, 16325,  255,
-          0, MTSCREEN, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 E5", 26202, 16325, 255, 0,
+          MTSCREEN, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xE6 =
-        { "Wacom ISDv4 E6",       WACOM_PKGLEN_TPC2FG,    27760, 15694,  255,
-          0, TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 2 };
+        { "Wacom ISDv4 E6", 27760, 15694, 255, 0,
+          TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
 static const struct wacom_features wacom_features_0xEC =
-        { "Wacom ISDv4 EC",       WACOM_PKGLEN_GRAPHIRE,  25710, 14500,  255,
-          0, TABLETPC,    WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 EC", 25710, 14500, 255, 0,
+          TABLETPC,    WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xED =
-        { "Wacom ISDv4 ED",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,
-          0, TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 ED", 26202, 16325, 255, 0,
+          TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xEF =
-        { "Wacom ISDv4 EF",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,
-          0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 EF", 26202, 16325, 255, 0,
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x100 =
-        { "Wacom ISDv4 100",      WACOM_PKGLEN_MTTPC,     26202, 16325,  255,
-          0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 100", 26202, 16325, 255, 0,
+          MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x101 =
-        { "Wacom ISDv4 101",      WACOM_PKGLEN_MTTPC,     26202, 16325,  255,
-          0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 101", 26202, 16325, 255, 0,
+          MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x10D =
-        { "Wacom ISDv4 10D",      WACOM_PKGLEN_MTTPC,     26202, 16325,  255,
-          0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 10D", 26202, 16325, 255, 0,
+          MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x10E =
-        { "Wacom ISDv4 10E",      WACOM_PKGLEN_MTTPC,     27760, 15694,  255,
-          0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 10E", 27760, 15694, 255, 0,
+          MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x10F =
-        { "Wacom ISDv4 10F",      WACOM_PKGLEN_MTTPC,     27760, 15694,  255,
-          0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 10F", 27760, 15694, 255, 0,
+          MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x116 =
-        { "Wacom ISDv4 116",      WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,
-          0, TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 116", 26202, 16325, 255, 0,
+          TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x4001 =
-        { "Wacom ISDv4 4001",      WACOM_PKGLEN_MTTPC,     26202, 16325,  255,
-          0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 4001", 26202, 16325, 255, 0,
+          MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x4004 =
-        { "Wacom ISDv4 4004",      WACOM_PKGLEN_MTTPC,     11060, 6220,  255,
-          0, MTTPC_B, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 4004", 11060, 6220, 255, 0,
+          MTTPC_B, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x5000 =
-        { "Wacom ISDv4 5000",      WACOM_PKGLEN_MTTPC,     27848, 15752,  1023,
-          0, MTTPC_B, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 5000", 27848, 15752, 1023, 0,
+          MTTPC_B, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x5002 =
-        { "Wacom ISDv4 5002",      WACOM_PKGLEN_MTTPC,     29576, 16724,  1023,
-          0, MTTPC_B, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom ISDv4 5002", 29576, 16724, 1023, 0,
+          MTTPC_B, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x47 =
-        { "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023,
-          31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Intuos2 6x8", 20320, 16240, 1023, 31,
+          INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x84 =
-        { "Wacom Wireless Receiver", WACOM_PKGLEN_WIRELESS, 0, 0, 0,
-          0, WIRELESS, 0, 0, .touch_max = 16 };
+        { "Wacom Wireless Receiver", 0, 0, 0, 0,
+          WIRELESS, 0, 0, .touch_max = 16 };
 static const struct wacom_features wacom_features_0xD0 =
-        { "Wacom Bamboo 2FG",     WACOM_PKGLEN_BBFUN,     14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 2 };
+        { "Wacom Bamboo 2FG", 14720, 9200, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
 static const struct wacom_features wacom_features_0xD1 =
-        { "Wacom Bamboo 2FG 4x5", WACOM_PKGLEN_BBFUN,     14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 2 };
+        { "Wacom Bamboo 2FG 4x5", 14720, 9200, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
 static const struct wacom_features wacom_features_0xD2 =
-        { "Wacom Bamboo Craft",   WACOM_PKGLEN_BBFUN,     14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 2 };
+        { "Wacom Bamboo Craft", 14720, 9200, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
 static const struct wacom_features wacom_features_0xD3 =
-        { "Wacom Bamboo 2FG 6x8", WACOM_PKGLEN_BBFUN,     21648, 13700, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 2 };
+        { "Wacom Bamboo 2FG 6x8", 21648, 13700, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
 static const struct wacom_features wacom_features_0xD4 =
-        { "Wacom Bamboo Pen",     WACOM_PKGLEN_BBFUN,     14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Bamboo Pen", 14720, 9200, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xD5 =
-        { "Wacom Bamboo Pen 6x8",     WACOM_PKGLEN_BBFUN, 21648, 13700, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Bamboo Pen 6x8", 21648, 13700, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xD6 =
-        { "Wacom BambooPT 2FG 4x5", WACOM_PKGLEN_BBFUN,   14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 2 };
+        { "Wacom BambooPT 2FG 4x5", 14720, 9200, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
 static const struct wacom_features wacom_features_0xD7 =
-        { "Wacom BambooPT 2FG Small", WACOM_PKGLEN_BBFUN, 14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 2 };
+        { "Wacom BambooPT 2FG Small", 14720, 9200, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
 static const struct wacom_features wacom_features_0xD8 =
-        { "Wacom Bamboo Comic 2FG", WACOM_PKGLEN_BBFUN,   21648, 13700, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 2 };
+        { "Wacom Bamboo Comic 2FG", 21648, 13700, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
 static const struct wacom_features wacom_features_0xDA =
-        { "Wacom Bamboo 2FG 4x5 SE", WACOM_PKGLEN_BBFUN,  14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 2 };
+        { "Wacom Bamboo 2FG 4x5 SE", 14720, 9200, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
 static const struct wacom_features wacom_features_0xDB =
-        { "Wacom Bamboo 2FG 6x8 SE", WACOM_PKGLEN_BBFUN,  21648, 13700, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 2 };
+        { "Wacom Bamboo 2FG 6x8 SE", 21648, 13700, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
 static const struct wacom_features wacom_features_0xDD =
-        { "Wacom Bamboo Connect", WACOM_PKGLEN_BBPEN,     14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Bamboo Connect", 14720, 9200, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xDE =
-        { "Wacom Bamboo 16FG 4x5", WACOM_PKGLEN_BBPEN,    14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 16 };
+        { "Wacom Bamboo 16FG 4x5", 14720, 9200, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 16 };
 static const struct wacom_features wacom_features_0xDF =
-        { "Wacom Bamboo 16FG 6x8", WACOM_PKGLEN_BBPEN,    21648, 13700, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 16 };
+        { "Wacom Bamboo 16FG 6x8", 21648, 13700, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 16 };
 static const struct wacom_features wacom_features_0x300 =
-        { "Wacom Bamboo One S",    WACOM_PKGLEN_BBPEN,    14720,  9225, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Bamboo One S", 14720, 9225, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x301 =
-        { "Wacom Bamboo One M",    WACOM_PKGLEN_BBPEN,    21648, 13530, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "Wacom Bamboo One M", 21648, 13530, 1023, 31,
+          BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x302 =
-        { "Wacom Intuos PT S",     WACOM_PKGLEN_BBPEN,    15200,  9500, 1023,
-          31, INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 16,
+        { "Wacom Intuos PT S", 15200, 9500, 1023, 31,
+          INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 16,
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
 static const struct wacom_features wacom_features_0x303 =
-        { "Wacom Intuos PT M",     WACOM_PKGLEN_BBPEN,    21600, 13500, 1023,
-          31, INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
-          .touch_max = 16,
+        { "Wacom Intuos PT M", 21600, 13500, 1023, 31,
+          INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 16,
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
 static const struct wacom_features wacom_features_0x30E =
-        { "Wacom Intuos S",        WACOM_PKGLEN_BBPEN,    15200,  9500, 1023,
-          31, INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+        { "Wacom Intuos S", 15200, 9500, 1023, 31,
+          INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
 static const struct wacom_features wacom_features_0x6004 =
-        { "ISD-V4",               WACOM_PKGLEN_GRAPHIRE,  12800,  8000,  255,
-          0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+        { "ISD-V4", 12800, 8000, 255, 0,
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x0307 =
-        { "Wacom ISDv5 307", WACOM_PKGLEN_INTUOS,  59352,  33648, 2047,
-          63, CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
+        { "Wacom ISDv5 307", 59352, 33648, 2047, 63,
+          CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
           .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x309 };
 static const struct wacom_features wacom_features_0x0309 =
         { "Wacom ISDv5 309", .type = WACOM_24HDT, /* Touch */
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index 2a7612ae14a6..4c592475b237 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -114,7 +114,6 @@ enum {
 
 struct wacom_features {
         const char *name;
-        int pktlen;
         int x_max;
         int y_max;
         int pressure_max;
@@ -137,6 +136,7 @@ struct wacom_features {
         unsigned touch_max;
         int oVid;
         int oPid;
+        int pktlen;
         bool check_for_hid_type;
         int hid_type;
 };