[media] staging: media: Remove unnecessary OOM messages

alloc failures already get standardized OOM
messages and a dump_stack.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/media/as102/as102_usb_drv.c b/drivers/staging/media/as102/as102_usb_drv.c
index aaf1bc2ad1b20bd8f48ec3c779c8ea27c005913a..9f275f02015044017c21196dfb883053b64b9964 100644 (file)
--- a/drivers/staging/media/as102/as102_usb_drv.c
+++ b/drivers/staging/media/as102/as102_usb_drv.c
@@ -374,10 +374,8 @@ static int as102_usb_probe(struct usb_interface *intf,
        }
 
        as102_dev = kzalloc(sizeof(struct as102_dev_t), GFP_KERNEL);
-       if (as102_dev == NULL) {
-               dev_err(&intf->dev, "%s: kzalloc failed\n", __func__);
+       if (as102_dev == NULL)
                return -ENOMEM;
-       }
 
        /* Assign the user-friendly device name */
        for (i = 0; i < ARRAY_SIZE(as102_usb_id_table); i++) {

diff --git a/drivers/staging/media/go7007/go7007-fw.c b/drivers/staging/media/go7007/go7007-fw.c
index f99c05b454b09f1ed1a7646178ccde517deef0b6..a5ede1c109d07e72fe754e6a761eb90269402b22 100644 (file)
--- a/drivers/staging/media/go7007/go7007-fw.c
+++ b/drivers/staging/media/go7007/go7007-fw.c
@@ -381,11 +381,8 @@ static int gen_mjpeghdr_to_package(struct go7007 *go, __le16 *code, int space)
        int size = 0, i, off = 0, chunk;
 
        buf = kzalloc(4096, GFP_KERNEL);
-       if (buf == NULL) {
-               dev_err(go->dev,
-                       "unable to allocate 4096 bytes for firmware construction\n");
+       if (buf == NULL)
                return -1;
-       }
 
        for (i = 1; i < 32; ++i) {
                mjpeg_frame_header(go, buf + size, i);
@@ -651,11 +648,9 @@ static int gen_mpeg1hdr_to_package(struct go7007 *go,
        int i, off = 0, chunk;
 
        buf = kzalloc(5120, GFP_KERNEL);
-       if (buf == NULL) {
-               dev_err(go->dev,
-                       "unable to allocate 5120 bytes for firmware construction\n");
+       if (buf == NULL)
                return -1;
-       }
+
        framelen[0] = mpeg1_frame_header(go, buf, 0, 1, PFRAME);
        if (go->interlace_coding)
                framelen[0] += mpeg1_frame_header(go, buf + framelen[0] / 8,
@@ -838,11 +833,9 @@ static int gen_mpeg4hdr_to_package(struct go7007 *go,
        int i, off = 0, chunk;
 
        buf = kzalloc(5120, GFP_KERNEL);
-       if (buf == NULL) {
-               dev_err(go->dev,
-                       "unable to allocate 5120 bytes for firmware construction\n");
+       if (buf == NULL)
                return -1;
-       }
+
        framelen[0] = mpeg4_frame_header(go, buf, 0, PFRAME);
        i = 368;
        framelen[1] = mpeg4_frame_header(go, buf + i, 0, BFRAME_PRE);
@@ -1582,12 +1575,9 @@ int go7007_construct_fw_image(struct go7007 *go, u8 **fw, int *fwlen)
                return -1;
        }
        code = kzalloc(codespace * 2, GFP_KERNEL);
-       if (code == NULL) {
-               dev_err(go->dev,
-                       "unable to allocate %d bytes for firmware construction\n",
-                       codespace * 2);
+       if (code == NULL)
                goto fw_failed;
-       }
+
        src = (__le16 *)fw_entry->data;
        srclen = fw_entry->size / 2;
        while (srclen >= 2) {

diff --git a/drivers/staging/media/go7007/s2250-loader.c b/drivers/staging/media/go7007/s2250-loader.c
index f57eb3beb3416f4d396164cd2b15a66f4323c964..72e5175fe7e3f4a66a6045f46df6356ece2bfb6b 100644 (file)
--- a/drivers/staging/media/go7007/s2250-loader.c
+++ b/drivers/staging/media/go7007/s2250-loader.c
@@ -81,10 +81,9 @@ static int s2250loader_probe(struct usb_interface *interface,
 
        /* Allocate dev data structure */
        s = kmalloc(sizeof(device_extension_t), GFP_KERNEL);
-       if (s == NULL) {
-               dev_err(&interface->dev, "Out of memory\n");
+       if (s == NULL)
                goto failed;
-       }
+
        s2250_dev_table[minor] = s;
 
        dev_info(&interface->dev,

diff --git a/drivers/staging/media/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c
index 343c622f938751b30ba09356734abd83b19b3176..0a2c45dd44756a514d9ab3f0dea5f3c5b82dd89f 100644 (file)
--- a/drivers/staging/media/lirc/lirc_imon.c
+++ b/drivers/staging/media/lirc/lirc_imon.c
@@ -744,7 +744,6 @@ static int imon_probe(struct usb_interface *interface,
 
        context = kzalloc(sizeof(struct imon_context), GFP_KERNEL);
        if (!context) {
-               dev_err(dev, "%s: kzalloc failed for context\n", __func__);
                alloc_status = 1;
                goto alloc_status_switch;
        }
@@ -826,13 +825,11 @@ static int imon_probe(struct usb_interface *interface,
 
        driver = kzalloc(sizeof(struct lirc_driver), GFP_KERNEL);
        if (!driver) {
-               dev_err(dev, "%s: kzalloc failed for lirc_driver\n", __func__);
                alloc_status = 2;
                goto alloc_status_switch;
        }
        rbuf = kmalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
        if (!rbuf) {
-               dev_err(dev, "%s: kmalloc failed for lirc_buffer\n", __func__);
                alloc_status = 3;
                goto alloc_status_switch;
        }

diff --git a/drivers/staging/media/lirc/lirc_sasem.c b/drivers/staging/media/lirc/lirc_sasem.c
index b3fe21e7a90dfdaceb38b2683706de90c9ac1dc3..68acca74ddb1e33544932b69a52855865f288c5f 100644 (file)
--- a/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@ -759,22 +759,16 @@ static int sasem_probe(struct usb_interface *interface,
 
        context = kzalloc(sizeof(struct sasem_context), GFP_KERNEL);
        if (!context) {
-               dev_err(&interface->dev,
-                       "%s: kzalloc failed for context\n", __func__);
                alloc_status = 1;
                goto alloc_status_switch;
        }
        driver = kzalloc(sizeof(struct lirc_driver), GFP_KERNEL);
        if (!driver) {
-               dev_err(&interface->dev,
-                       "%s: kzalloc failed for lirc_driver\n", __func__);
                alloc_status = 2;
                goto alloc_status_switch;
        }
        rbuf = kmalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
        if (!rbuf) {
-               dev_err(&interface->dev,
-                       "%s: kmalloc failed for lirc_buffer\n", __func__);
                alloc_status = 3;
                goto alloc_status_switch;
        }