Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1385985

[PATCH] clk: fix member type of struct clk_hw_onecell_data

Show all headers | View raw

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@socionext.com>
---

 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] clk: fix member type of struct clk_hw_onecell_data Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-25 05:00 +0200
  Re: [PATCH] clk: fix member type of struct clk_hw_onecell_data Stephen Boyd <sboyd@codeaurora.org> - 2016-04-26 00:30 +0200
    Re: [PATCH] clk: fix member type of struct clk_hw_onecell_data Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-26 08:20 +0200

csiph-web