Commit 98f99e67 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'flex-array-transformations-6.4-rc1' of...

Merge tag 'flex-array-transformations-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux

Pull flexible-array updates from Gustavo Silva:
 "Transform more zero-length and one-element arrays into C99
  flexible-array members"

* tag 'flex-array-transformations-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
  uapi: net: ipv6: Replace fake flex-array with flex-array member
  drm/vmwgfx: Replace one-element array with flexible-array member
  ASoC: uapi: Replace zero-length arrays with __DECLARE_FLEX_ARRAY() helper
parents 0cfd8703 00168b41
...@@ -71,7 +71,7 @@ struct vmw_view { ...@@ -71,7 +71,7 @@ struct vmw_view {
unsigned view_id; /* Immutable */ unsigned view_id; /* Immutable */
u32 cmd_size; /* Immutable */ u32 cmd_size; /* Immutable */
bool committed; /* Protected by binding_mutex */ bool committed; /* Protected by binding_mutex */
u32 cmd[1]; /* Immutable */ u32 cmd[]; /* Immutable */
}; };
static int vmw_view_create(struct vmw_resource *res); static int vmw_view_create(struct vmw_resource *res);
......
...@@ -81,7 +81,7 @@ struct ipv6_opt_hdr { ...@@ -81,7 +81,7 @@ struct ipv6_opt_hdr {
struct rt0_hdr { struct rt0_hdr {
struct ipv6_rt_hdr rt_hdr; struct ipv6_rt_hdr rt_hdr;
__u32 reserved; __u32 reserved;
struct in6_addr addr[0]; struct in6_addr addr[];
#define rt0_type rt_hdr.type #define rt0_type rt_hdr.type
}; };
......
...@@ -222,9 +222,9 @@ struct snd_soc_tplg_vendor_array { ...@@ -222,9 +222,9 @@ struct snd_soc_tplg_vendor_array {
__le32 type; /* SND_SOC_TPLG_TUPLE_TYPE_ */ __le32 type; /* SND_SOC_TPLG_TUPLE_TYPE_ */
__le32 num_elems; /* number of elements in array */ __le32 num_elems; /* number of elements in array */
union { union {
struct snd_soc_tplg_vendor_uuid_elem uuid[0]; __DECLARE_FLEX_ARRAY(struct snd_soc_tplg_vendor_uuid_elem, uuid);
struct snd_soc_tplg_vendor_value_elem value[0]; __DECLARE_FLEX_ARRAY(struct snd_soc_tplg_vendor_value_elem, value);
struct snd_soc_tplg_vendor_string_elem string[0]; __DECLARE_FLEX_ARRAY(struct snd_soc_tplg_vendor_string_elem, string);
}; };
} __attribute__((packed)); } __attribute__((packed));
......
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