diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-04-01 13:34:38 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-04-01 13:34:38 +0200 |
| commit | 0460ceb8c594b2664f80a2d319cac49b4a061c22 (patch) | |
| tree | c3611e0ddc41a07b2e2ec9afe315181ccf618ff3 /drivers | |
| parent | 4c805fb704fc7890ec6615b286f09aeb5e2603d4 (diff) | |
| parent | 56d8623cedf929bfb1385868e423b978d0e76eea (diff) | |
Merge branch 'for-5.7/ish' into for-linus
- C99 code purification in intel-ish-hid from Gustavo A. R. Silva
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/intel-ish-hid/ishtp/hbm.h | 2 | ||||
| -rw-r--r-- | drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/intel-ish-hid/ishtp/hbm.h b/drivers/hid/intel-ish-hid/ishtp/hbm.h index bb85985b1620..7c445b203f2a 100644 --- a/drivers/hid/intel-ish-hid/ishtp/hbm.h +++ b/drivers/hid/intel-ish-hid/ishtp/hbm.h @@ -82,7 +82,7 @@ struct ishtp_msg_hdr { struct ishtp_bus_message { uint8_t hbm_cmd; - uint8_t data[0]; + uint8_t data[]; } __packed; /** diff --git a/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h b/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h index 39e0e6c73adf..1cc6364aa957 100644 --- a/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h +++ b/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h @@ -214,7 +214,7 @@ struct ishtp_device { const struct ishtp_hw_ops *ops; size_t mtu; uint32_t ishtp_msg_hdr; - char hw[0] __aligned(sizeof(void *)); + char hw[] __aligned(sizeof(void *)); }; static inline unsigned long ishtp_secs_to_jiffies(unsigned long sec) |