Commit 0460ceb8 authored by Jiri Kosina's avatar Jiri Kosina

Merge branch 'for-5.7/ish' into for-linus

- C99 code purification in intel-ish-hid from Gustavo A. R. Silva
parents 4c805fb7 56d8623c
...@@ -82,7 +82,7 @@ struct ishtp_msg_hdr { ...@@ -82,7 +82,7 @@ struct ishtp_msg_hdr {
struct ishtp_bus_message { struct ishtp_bus_message {
uint8_t hbm_cmd; uint8_t hbm_cmd;
uint8_t data[0]; uint8_t data[];
} __packed; } __packed;
/** /**
......
...@@ -214,7 +214,7 @@ struct ishtp_device { ...@@ -214,7 +214,7 @@ struct ishtp_device {
const struct ishtp_hw_ops *ops; const struct ishtp_hw_ops *ops;
size_t mtu; size_t mtu;
uint32_t ishtp_msg_hdr; 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) static inline unsigned long ishtp_secs_to_jiffies(unsigned long sec)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment