lkml.org 
[lkml]   [2020]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 4/4] media: cx231xx: Consolidate dmesg output
    The memory allocations in cx231xx_init_*() happen all in task context with
    GFP_KERNEL. Therefore a dev_err() trying to deduce whether this is called
    from task or interrupt context is pretty useless.

    Remove these historical leftovers.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
    Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Cc: linux-media@vger.kernel.org

    ---
    drivers/media/usb/cx231xx/cx231xx-core.c | 10 ++++------
    drivers/media/usb/cx231xx/cx231xx-vbi.c | 3 +--
    2 files changed, 5 insertions(+), 8 deletions(-)

    --- a/drivers/media/usb/cx231xx/cx231xx-core.c
    +++ b/drivers/media/usb/cx231xx/cx231xx-core.c
    @@ -1061,9 +1061,8 @@ int cx231xx_init_isoc(struct cx231xx *de
    &urb->transfer_dma);
    if (!dev->video_mode.isoc_ctl.transfer_buffer[i]) {
    dev_err(dev->dev,
    - "unable to allocate %i bytes for transfer buffer %i%s\n",
    - sb_size, i,
    - in_interrupt() ? " while in int" : "");
    + "unable to allocate %i bytes for transfer buffer %i\n",
    + sb_size, i);
    cx231xx_uninit_isoc(dev);
    return -ENOMEM;
    }
    @@ -1197,9 +1196,8 @@ int cx231xx_init_bulk(struct cx231xx *de
    &urb->transfer_dma);
    if (!dev->video_mode.bulk_ctl.transfer_buffer[i]) {
    dev_err(dev->dev,
    - "unable to allocate %i bytes for transfer buffer %i%s\n",
    - sb_size, i,
    - in_interrupt() ? " while in int" : "");
    + "unable to allocate %i bytes for transfer buffer %i\n",
    + sb_size, i);
    cx231xx_uninit_bulk(dev);
    return -ENOMEM;
    }
    --- a/drivers/media/usb/cx231xx/cx231xx-vbi.c
    +++ b/drivers/media/usb/cx231xx/cx231xx-vbi.c
    @@ -409,8 +409,7 @@ int cx231xx_init_vbi_isoc(struct cx231xx
    if (!dev->vbi_mode.bulk_ctl.transfer_buffer[i]) {
    dev_err(dev->dev,
    "unable to allocate %i bytes for transfer buffer %i%s\n",
    - sb_size, i,
    - in_interrupt() ? " while in int" : "");
    + sb_size, i);
    cx231xx_uninit_vbi_isoc(dev);
    return -ENOMEM;
    }
    \
     
     \ /
      Last update: 2020-10-13 16:40    [W:2.910 / U:0.400 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site