| Message ID | 20211110230043.701167-1-linux@weissschuh.net (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | [1/4] HID: intel-ish-hid: fw-loader: constify devicetable initializer | expand |
Hi, On 2021-11-11 00:00+0100, Thomas Weißschuh wrote: > Previously the compilation broke on clang and gcc < 8.1.0 with errors like > "error: initializer element is not constant". > > Fixes: 44e2a58cb880 ("HID: intel-ish-hid: fw-loader: only load for matching devices") > Reported-by: Nathan Chancellor <nathan@kernel.org> > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > --- > drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/hid/intel-ish-hid/ishtp-fw-loader.c b/drivers/hid/intel-ish-hid/ishtp-fw-loader.c > index 945a9d0b68cd..26f376faf0e6 100644 > --- a/drivers/hid/intel-ish-hid/ishtp-fw-loader.c > +++ b/drivers/hid/intel-ish-hid/ishtp-fw-loader.c > @@ -76,9 +76,9 @@ enum ish_loader_commands { > #define LOADER_XFER_MODE_ISHTP BIT(1) > > /* ISH Transport Loader client unique GUID */ > -static const guid_t loader_ishtp_guid = > - GUID_INIT(0xc804d06a, 0x55bd, 0x4ea7, > - 0xad, 0xed, 0x1e, 0x31, 0x22, 0x8c, 0x76, 0xdc); > +#define ISHTP_GUID GUID_INIT(0xc804d06a, 0x55bd, 0x4ea7, \ > + 0xad, 0xed, 0x1e, 0x31, 0x22, 0x8c, 0x76, 0xdc) > +static const guid_t loader_ishtp_guid = ISHTP_GUID; > > #define FILENAME_SIZE 256 > > @@ -1064,7 +1064,7 @@ static struct ishtp_cl_driver loader_ishtp_cl_driver = { > }; > > static const struct ishtp_device_id loader_ishtp_id_table[] = { > - { loader_ishtp_guid }, > + { ISHTP_GUID }, > { } > }; > MODULE_DEVICE_TABLE(ishtp, loader_ishtp_id_table); > > base-commit: 64355db3caf6468dc711995239efe0cbcd7d0091 > -- > 2.33.1 > Please drop this whole series and use the patch "HID: intel-ish-hid: fix module device-id handling"[0] from Arnd instead. It adds proper device table support to the ISHTP bus itself also preventing unused-variable warnings for the device table when the drivers are built-in. Thanks, Thomas [0] https://lore.kernel.org/lkml/20211111085842.2846422-1-arnd@kernel.org/
diff --git a/drivers/hid/intel-ish-hid/ishtp-fw-loader.c b/drivers/hid/intel-ish-hid/ishtp-fw-loader.c index 945a9d0b68cd..26f376faf0e6 100644 --- a/drivers/hid/intel-ish-hid/ishtp-fw-loader.c +++ b/drivers/hid/intel-ish-hid/ishtp-fw-loader.c @@ -76,9 +76,9 @@ enum ish_loader_commands { #define LOADER_XFER_MODE_ISHTP BIT(1) /* ISH Transport Loader client unique GUID */ -static const guid_t loader_ishtp_guid = - GUID_INIT(0xc804d06a, 0x55bd, 0x4ea7, - 0xad, 0xed, 0x1e, 0x31, 0x22, 0x8c, 0x76, 0xdc); +#define ISHTP_GUID GUID_INIT(0xc804d06a, 0x55bd, 0x4ea7, \ + 0xad, 0xed, 0x1e, 0x31, 0x22, 0x8c, 0x76, 0xdc) +static const guid_t loader_ishtp_guid = ISHTP_GUID; #define FILENAME_SIZE 256 @@ -1064,7 +1064,7 @@ static struct ishtp_cl_driver loader_ishtp_cl_driver = { }; static const struct ishtp_device_id loader_ishtp_id_table[] = { - { loader_ishtp_guid }, + { ISHTP_GUID }, { } }; MODULE_DEVICE_TABLE(ishtp, loader_ishtp_id_table);
Previously the compilation broke on clang and gcc < 8.1.0 with errors like "error: initializer element is not constant". Fixes: 44e2a58cb880 ("HID: intel-ish-hid: fw-loader: only load for matching devices") Reported-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> --- drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) base-commit: 64355db3caf6468dc711995239efe0cbcd7d0091