diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2017-09-26 22:25:38 +0200 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-13 17:40:11 -0800 |
| commit | 1cc36f73005427c7a74b0fdf0177cd0bf981e9ff (patch) | |
| tree | 60a81a4d4697f2ccdad1a889c7d0438f3da92072 | |
| parent | 62c73ed5bf6372bd8417897ea9dcaf1d50d50de6 (diff) | |
| download | talos-obmc-linux-1cc36f73005427c7a74b0fdf0177cd0bf981e9ff.tar.gz talos-obmc-linux-1cc36f73005427c7a74b0fdf0177cd0bf981e9ff.zip | |
clk: mmp: Delete error messages for failed memory allocations
Omit extra messages for a memory allocation failure in these
functions.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
| -rw-r--r-- | drivers/clk/mmp/clk-frac.c | 4 | ||||
| -rw-r--r-- | drivers/clk/mmp/clk-gate.c | 4 | ||||
| -rw-r--r-- | drivers/clk/mmp/clk-mix.c | 9 |
3 files changed, 3 insertions, 14 deletions
diff --git a/drivers/clk/mmp/clk-frac.c b/drivers/clk/mmp/clk-frac.c index 584a9927993b..98dfb9568d4f 100644 --- a/drivers/clk/mmp/clk-frac.c +++ b/drivers/clk/mmp/clk-frac.c @@ -172,10 +172,8 @@ struct clk *mmp_clk_register_factor(const char *name, const char *parent_name, } factor = kzalloc(sizeof(*factor), GFP_KERNEL); - if (!factor) { - pr_err("%s: could not allocate factor clk\n", __func__); + if (!factor) return ERR_PTR(-ENOMEM); - } /* struct clk_aux assignments */ factor->base = base; diff --git a/drivers/clk/mmp/clk-gate.c b/drivers/clk/mmp/clk-gate.c index d20cd3431ac2..7355595c42e2 100644 --- a/drivers/clk/mmp/clk-gate.c +++ b/drivers/clk/mmp/clk-gate.c @@ -103,10 +103,8 @@ struct clk *mmp_clk_register_gate(struct device *dev, const char *name, /* allocate the gate */ gate = kzalloc(sizeof(*gate), GFP_KERNEL); - if (!gate) { - pr_err("%s:%s could not allocate gate clk\n", __func__, name); + if (!gate) return ERR_PTR(-ENOMEM); - } init.name = name; init.ops = &mmp_clk_gate_ops; diff --git a/drivers/clk/mmp/clk-mix.c b/drivers/clk/mmp/clk-mix.c index c554833cffc5..1ae532df20f7 100644 --- a/drivers/clk/mmp/clk-mix.c +++ b/drivers/clk/mmp/clk-mix.c @@ -451,11 +451,8 @@ struct clk *mmp_clk_register_mix(struct device *dev, size_t table_bytes; mix = kzalloc(sizeof(*mix), GFP_KERNEL); - if (!mix) { - pr_err("%s:%s: could not allocate mmp mix clk\n", - __func__, name); + if (!mix) return ERR_PTR(-ENOMEM); - } init.name = name; init.flags = flags | CLK_GET_RATE_NOCACHE; @@ -468,8 +465,6 @@ struct clk *mmp_clk_register_mix(struct device *dev, table_bytes = sizeof(*config->table) * config->table_size; mix->table = kmemdup(config->table, table_bytes, GFP_KERNEL); if (!mix->table) { - pr_err("%s:%s: could not allocate mmp mix table\n", - __func__, name); kfree(mix); return ERR_PTR(-ENOMEM); } @@ -481,8 +476,6 @@ struct clk *mmp_clk_register_mix(struct device *dev, mix->mux_table = kmemdup(config->mux_table, table_bytes, GFP_KERNEL); if (!mix->mux_table) { - pr_err("%s:%s: could not allocate mmp mix mux-table\n", - __func__, name); kfree(mix->table); kfree(mix); return ERR_PTR(-ENOMEM); |
