diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2019-05-23 17:39:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-27 10:07:00 +0200 |
| commit | 6cdbdf4073912da4d8428f9fad914eb7147fb510 (patch) | |
| tree | 5abda6fc28bdb1491e5c7201c4dcc3cec8458213 /drivers/clk | |
| parent | a57be6b7ee47e92618ce13430e158c91cfaba3ca (diff) | |
| download | barebox-6cdbdf4073912da4d8428f9fad914eb7147fb510.tar.gz barebox-6cdbdf4073912da4d8428f9fad914eb7147fb510.tar.xz | |
clk: at91: fix warning about missing const-safety
compiling clk-main.c and clk-generated.c results in:
warning: passing argument 1 of 'memcpy' discards 'const' qualifier from
pointer target type [-Wdiscarded-qualifiers]
memcpy(clkmain->clk.parent_names, parent_names, parents_array_size);
~~~~~~~~~~~~^~~~~~~~~~~~~
Avoid this by replacing the xzalloc+memcpy pair with xmemdup.
Zero-initialization of the buffer isn't necessary, because
memcpy spans the whole buffer.
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/at91/clk-generated.c | 3 | ||||
| -rw-r--r-- | drivers/clk/at91/clk-main.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c index 60516ca10f..396c35f3a7 100644 --- a/drivers/clk/at91/clk-generated.c +++ b/drivers/clk/at91/clk-generated.c @@ -181,8 +181,7 @@ at91_clk_register_generated(struct regmap *regmap, gck->hw.ops = &generated_ops; parents_array_size = num_parents * sizeof(gck->hw.parent_names[0]); - gck->hw.parent_names = xzalloc(parents_array_size); - memcpy(gck->hw.parent_names, parent_names, parents_array_size); + gck->hw.parent_names = xmemdup(parent_names, parents_array_size); gck->hw.num_parents = num_parents; /* gck->hw.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE; */ diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c index 4d4127dd00..abae35566c 100644 --- a/drivers/clk/at91/clk-main.c +++ b/drivers/clk/at91/clk-main.c @@ -455,8 +455,7 @@ at91_clk_register_sam9x5_main(struct regmap *regmap, clkmain->clk.name = name; clkmain->clk.ops = &sam9x5_main_ops; parents_array_size = num_parents * sizeof (clkmain->clk.parent_names[0]); - clkmain->clk.parent_names = xzalloc(parents_array_size); - memcpy(clkmain->clk.parent_names, parent_names, parents_array_size); + clkmain->clk.parent_names = xmemdup(parent_names, parents_array_size); clkmain->clk.num_parents = num_parents; /* init.flags = CLK_SET_PARENT_GATE; */ |