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

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

- C99 code purification in intel-ish-hid from Gustavo A. R. Silva
parents 4c805fb7 56d8623c

drivers/hid/intel-ish-hid/ishtp/hbm.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct ishtp_msg_hdr { 


struct ishtp_bus_message {

	uint8_t hbm_cmd;

	uint8_t data[0];

	uint8_t data[];

} __packed;



/**

drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h

+1 −1
Original line number Diff line number Diff line
@@ -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)