diff options
| -rw-r--r-- | drivers/base/firmware_class.c | 1 | ||||
| -rw-r--r-- | drivers/base/power/clock_ops.c | 4 | ||||
| -rw-r--r-- | drivers/base/power/opp.c | 8 |
3 files changed, 3 insertions, 10 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 58470c395301..c3293f0a8573 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c | |||
| @@ -855,7 +855,6 @@ fw_create_instance(struct firmware *firmware, const char *fw_name, | |||
| 855 | 855 | ||
| 856 | fw_priv = kzalloc(sizeof(*fw_priv), GFP_KERNEL); | 856 | fw_priv = kzalloc(sizeof(*fw_priv), GFP_KERNEL); |
| 857 | if (!fw_priv) { | 857 | if (!fw_priv) { |
| 858 | dev_err(device, "%s: kmalloc failed\n", __func__); | ||
| 859 | fw_priv = ERR_PTR(-ENOMEM); | 858 | fw_priv = ERR_PTR(-ENOMEM); |
| 860 | goto exit; | 859 | goto exit; |
| 861 | } | 860 | } |
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c index d626576a4f75..7fdd0172605a 100644 --- a/drivers/base/power/clock_ops.c +++ b/drivers/base/power/clock_ops.c | |||
| @@ -81,10 +81,8 @@ static int __pm_clk_add(struct device *dev, const char *con_id, | |||
| 81 | return -EINVAL; | 81 | return -EINVAL; |
| 82 | 82 | ||
| 83 | ce = kzalloc(sizeof(*ce), GFP_KERNEL); | 83 | ce = kzalloc(sizeof(*ce), GFP_KERNEL); |
| 84 | if (!ce) { | 84 | if (!ce) |
| 85 | dev_err(dev, "Not enough memory for clock entry.\n"); | ||
| 86 | return -ENOMEM; | 85 | return -ENOMEM; |
| 87 | } | ||
| 88 | 86 | ||
| 89 | if (con_id) { | 87 | if (con_id) { |
| 90 | ce->con_id = kstrdup(con_id, GFP_KERNEL); | 88 | ce->con_id = kstrdup(con_id, GFP_KERNEL); |
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index 15bf29974c31..677fb2843553 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c | |||
| @@ -474,10 +474,8 @@ static int _opp_add_dynamic(struct device *dev, unsigned long freq, | |||
| 474 | 474 | ||
| 475 | /* allocate new OPP node */ | 475 | /* allocate new OPP node */ |
| 476 | new_opp = kzalloc(sizeof(*new_opp), GFP_KERNEL); | 476 | new_opp = kzalloc(sizeof(*new_opp), GFP_KERNEL); |
| 477 | if (!new_opp) { | 477 | if (!new_opp) |
| 478 | dev_warn(dev, "%s: Unable to create new OPP node\n", __func__); | ||
| 479 | return -ENOMEM; | 478 | return -ENOMEM; |
| 480 | } | ||
| 481 | 479 | ||
| 482 | /* Hold our list modification lock here */ | 480 | /* Hold our list modification lock here */ |
| 483 | mutex_lock(&dev_opp_list_lock); | 481 | mutex_lock(&dev_opp_list_lock); |
| @@ -695,10 +693,8 @@ static int _opp_set_availability(struct device *dev, unsigned long freq, | |||
| 695 | 693 | ||
| 696 | /* keep the node allocated */ | 694 | /* keep the node allocated */ |
| 697 | new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL); | 695 | new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL); |
| 698 | if (!new_opp) { | 696 | if (!new_opp) |
| 699 | dev_warn(dev, "%s: Unable to create OPP\n", __func__); | ||
| 700 | return -ENOMEM; | 697 | return -ENOMEM; |
| 701 | } | ||
| 702 | 698 | ||
| 703 | mutex_lock(&dev_opp_list_lock); | 699 | mutex_lock(&dev_opp_list_lock); |
| 704 | 700 | ||
