diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2014-09-29 09:31:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-29 11:56:01 -0400 |
commit | 2628118b60b9d5bb4c580a1d5973a8e1d31a50f2 (patch) | |
tree | dadb0689a269a4288e6bd78394beb8f194bc9d62 /drivers/misc | |
parent | 55e43d1fc0fb8dd04ae8fc067994f00edae34941 (diff) |
mei: kill error message for allocation failure
There is no need to log memory allocation errors as
this is already done by the memory subsystem.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/mei/amthif.c | 4 | ||||
-rw-r--r-- | drivers/misc/mei/interrupt.c | 1 | ||||
-rw-r--r-- | drivers/misc/mei/main.c | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index 46241a6d79e7..1f80873c8fe9 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c | |||
@@ -96,10 +96,8 @@ int mei_amthif_host_init(struct mei_device *dev) | |||
96 | /* allocate storage for ME message buffer */ | 96 | /* allocate storage for ME message buffer */ |
97 | msg_buf = kcalloc(dev->iamthif_mtu, | 97 | msg_buf = kcalloc(dev->iamthif_mtu, |
98 | sizeof(unsigned char), GFP_KERNEL); | 98 | sizeof(unsigned char), GFP_KERNEL); |
99 | if (!msg_buf) { | 99 | if (!msg_buf) |
100 | dev_err(&dev->pdev->dev, "amthif: memory allocation for ME message buffer failed.\n"); | ||
101 | return -ENOMEM; | 100 | return -ENOMEM; |
102 | } | ||
103 | 101 | ||
104 | dev->iamthif_msg_buf = msg_buf; | 102 | dev->iamthif_msg_buf = msg_buf; |
105 | 103 | ||
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c index 1b6c14b8642e..b8d9cfee3e87 100644 --- a/drivers/misc/mei/interrupt.c +++ b/drivers/misc/mei/interrupt.c | |||
@@ -126,7 +126,6 @@ static int mei_cl_irq_read_msg(struct mei_device *dev, | |||
126 | GFP_KERNEL); | 126 | GFP_KERNEL); |
127 | 127 | ||
128 | if (!buffer) { | 128 | if (!buffer) { |
129 | cl_err(dev, cl, "allocation failed.\n"); | ||
130 | list_del(&cb->list); | 129 | list_del(&cb->list); |
131 | return -ENOMEM; | 130 | return -ENOMEM; |
132 | } | 131 | } |
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index d60621ef5621..244fb6bf7463 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c | |||
@@ -377,7 +377,6 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf, | |||
377 | 377 | ||
378 | write_cb = mei_io_cb_init(cl, file); | 378 | write_cb = mei_io_cb_init(cl, file); |
379 | if (!write_cb) { | 379 | if (!write_cb) { |
380 | dev_err(&dev->pdev->dev, "write cb allocation failed\n"); | ||
381 | rets = -ENOMEM; | 380 | rets = -ENOMEM; |
382 | goto out; | 381 | goto out; |
383 | } | 382 | } |