lkml.org 
[lkml]   [2021]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/4] platform/chrome: chros_ec_ishtp: constify devicetable initializer
    Date
    Previously the compilation broke on clang and gcc < 8.1.0 with errors like
    "error: initializer element is not constant".

    Fixes: facfe0a4fdce ("platform/chrome: chros_ec_ishtp: only load for matching devices")
    Reported-by: Nathan Chancellor <nathan@kernel.org>
    Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
    ---
    drivers/platform/chrome/cros_ec_ishtp.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c
    index 8c17358e84c1..2e635fee854c 100644
    --- a/drivers/platform/chrome/cros_ec_ishtp.c
    +++ b/drivers/platform/chrome/cros_ec_ishtp.c
    @@ -41,9 +41,9 @@ enum cros_ec_ish_channel {
    #define ISHTP_SEND_TIMEOUT (3 * HZ)

    /* ISH Transport CrOS EC ISH client unique GUID */
    -static const guid_t cros_ish_guid =
    - GUID_INIT(0x7b7154d0, 0x56f4, 0x4bdc,
    - 0xb0, 0xd8, 0x9e, 0x7c, 0xda, 0xe0, 0xd6, 0xa0);
    +#define CROS_ISH_GUID GUID_INIT(0x7b7154d0, 0x56f4, 0x4bdc, \
    + 0xb0, 0xd8, 0x9e, 0x7c, 0xda, 0xe0, 0xd6, 0xa0)
    +static const guid_t cros_ish_guid = CROS_ISH_GUID;

    struct header {
    u8 channel;
    @@ -775,7 +775,7 @@ static struct ishtp_cl_driver cros_ec_ishtp_driver = {
    };

    static const struct ishtp_device_id cros_ec_ishtp_id_table[] = {
    - { cros_ish_guid },
    + { CROS_ISH_GUID },
    { }
    };
    MODULE_DEVICE_TABLE(ishtp, cros_ec_ishtp_id_table);
    --
    2.33.1
    \
     
     \ /
      Last update: 2021-11-11 00:01    [W:3.072 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site