[PATCH] clk: fix member type of struct clk_hw_onecell_data

From: Masahiro Yamada
Date: Sun Apr 24 2016 - 22:50:46 EST


We cannot assign any value to an array type variable. So,

hw_data->hws = kcalloc(hw_data->num, sizeof(struct clk_hw *),
GFP_KERNEL);

fails with "invalid use of flexible array member" error.

There are two ways to fix this issue.

[1] Make it a double-pointer
struct clk_hw_onecell_data {
size_t num;
struct clk_hw **hws;
};

This works as struct clk_onecell_data does.

[2] Make it a zero-sized array
struct clk_hw_onecell_data {
size_t num;
struct clk_hw *hws[0];
};

This allows one-shot memory allocation like this:

hw_data = kmalloc(sizeof(*hw_data) + clk_num * sizeof(struct clk_hw *),
GFP_KERNEL);

This commit adopts [2] because it looks like Stephen's intention
(he moved hws[] to the bottom of struct clk_hw_onecell_data).

Fixes: 0861e5b8cf80 ("clk: Add clk_hw OF clk providers")
Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
---

include/linux/clk-provider.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index fd2ccd5..1850e25 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -769,7 +769,7 @@ struct clk_onecell_data {

struct clk_hw_onecell_data {
size_t num;
- struct clk_hw *hws[];
+ struct clk_hw *hws[0];
};

extern struct of_device_id __clk_of_table;
--
1.9.1