From: "Thomas Weißschuh" <linux@weissschuh.net>
To: Nathan Chancellor <nathan@kernel.org>,
linux-input@vger.kernel.org, Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: "Thomas Weißschuh" <linux@weissschuh.net>,
linux-kernel@vger.kernel.org,
"Srinivas Pandruvada" <srinivas.pandruvada@linux.intel.com>,
"Rushikesh S Kadam" <rushikesh.s.kadam@intel.com>,
"Benson Leung" <bleung@chromium.org>,
"Enric Balletbo i Serra" <enric.balletbo@collabora.com>,
"Guenter Roeck" <groeck@chromium.org>,
llvm@lists.linux.dev
Subject: [PATCH 1/4] HID: intel-ish-hid: fw-loader: constify devicetable initializer
Date: Thu, 11 Nov 2021 00:00:40 +0100 [thread overview]
Message-ID: <20211110230043.701167-1-linux@weissschuh.net> (raw)
In-Reply-To: <YYv22iWQ7yTfMNC5@archlinux-ax161>
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
next prev parent reply other threads:[~2021-11-10 23:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20211029152901.297939-1-linux@weissschuh.net>
[not found] ` <20211029152901.297939-2-linux@weissschuh.net>
[not found] ` <20211029152901.297939-3-linux@weissschuh.net>
[not found] ` <20211029152901.297939-4-linux@weissschuh.net>
[not found] ` <20211029152901.297939-5-linux@weissschuh.net>
[not found] ` <20211029152901.297939-6-linux@weissschuh.net>
2021-11-10 16:44 ` [PATCH 5/6] platform/chrome: chros_ec_ishtp: only load for matching devices Nathan Chancellor
2021-11-10 23:00 ` Thomas Weißschuh [this message]
2021-11-11 9:10 ` [PATCH 1/4] HID: intel-ish-hid: fw-loader: constify devicetable initializer Thomas Weißschuh
2021-11-10 23:00 ` [PATCH 2/4] HID: intel-ish-hid: hid-client: " Thomas Weißschuh
2021-11-10 23:00 ` [PATCH 3/4] platform/chrome: chros_ec_ishtp: " Thomas Weißschuh
2021-11-10 23:00 ` [PATCH 4/4] platform/x86: isthp_eclite: " Thomas Weißschuh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211110230043.701167-1-linux@weissschuh.net \
--to=linux@weissschuh.net \
--cc=benjamin.tissoires@redhat.com \
--cc=bleung@chromium.org \
--cc=enric.balletbo@collabora.com \
--cc=groeck@chromium.org \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=nathan@kernel.org \
--cc=rushikesh.s.kadam@intel.com \
--cc=srinivas.pandruvada@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox