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>

diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 46241a6d79e737d3abfd3cb5f609a05cbd402ec4..1f80873c8fe98110f1f302c8aaecd958dedf13f7 100644 (file)
--- 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)
        /* allocate storage for ME message buffer */
        msg_buf = kcalloc(dev->iamthif_mtu,
                        sizeof(unsigned char), GFP_KERNEL);
-       if (!msg_buf) {
-               dev_err(&dev->pdev->dev, "amthif: memory allocation for ME message buffer failed.\n");
+       if (!msg_buf)
                return -ENOMEM;
-       }
 
        dev->iamthif_msg_buf = msg_buf;
 

diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 1b6c14b8642ede48a6d8599991de6632460c3abc..b8d9cfee3e879320125cde419e04cb78efe5e5e0 100644 (file)
--- 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,
                                          GFP_KERNEL);
 
                        if (!buffer) {
-                               cl_err(dev, cl, "allocation failed.\n");
                                list_del(&cb->list);
                                return -ENOMEM;
                        }

diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index d60621ef5621ea988676cbc9df09c882e88a3046..244fb6bf74630a388fde00ff81ae8d0002770ddb 100644 (file)
--- 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,
 
        write_cb = mei_io_cb_init(cl, file);
        if (!write_cb) {
-               dev_err(&dev->pdev->dev, "write cb allocation failed\n");
                rets = -ENOMEM;
                goto out;
        }