lkml.org 
[lkml]   [2018]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/4] media/ttusb-budget: remove pci_zalloc_coherent abuse
    Date
    Switch to a plain kzalloc instead of pci_zalloc_coherent to allocate
    memory for the USB DMA.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 18 ++++--------------
    1 file changed, 4 insertions(+), 14 deletions(-)

    diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
    index a142b9dc0feb..ea40a24947ba 100644
    --- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
    +++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
    @@ -102,7 +102,6 @@ struct ttusb {
    unsigned int isoc_in_pipe;

    void *iso_buffer;
    - dma_addr_t iso_dma_handle;

    struct urb *iso_urb[ISO_BUF_COUNT];

    @@ -792,26 +791,17 @@ static void ttusb_free_iso_urbs(struct ttusb *ttusb)

    for (i = 0; i < ISO_BUF_COUNT; i++)
    usb_free_urb(ttusb->iso_urb[i]);
    -
    - pci_free_consistent(NULL,
    - ISO_FRAME_SIZE * FRAMES_PER_ISO_BUF *
    - ISO_BUF_COUNT, ttusb->iso_buffer,
    - ttusb->iso_dma_handle);
    + kfree(ttusb->iso_buffer);
    }

    static int ttusb_alloc_iso_urbs(struct ttusb *ttusb)
    {
    int i;

    - ttusb->iso_buffer = pci_zalloc_consistent(NULL,
    - ISO_FRAME_SIZE * FRAMES_PER_ISO_BUF * ISO_BUF_COUNT,
    - &ttusb->iso_dma_handle);
    -
    - if (!ttusb->iso_buffer) {
    - dprintk("%s: pci_alloc_consistent - not enough memory\n",
    - __func__);
    + ttusb->iso_buffer = kcalloc(FRAMES_PER_ISO_BUF * ISO_BUF_COUNT,
    + ISO_FRAME_SIZE, GFP_KERNEL);
    + if (!ttusb->iso_buffer)
    return -ENOMEM;
    - }

    for (i = 0; i < ISO_BUF_COUNT; i++) {
    struct urb *urb;
    --
    2.14.2
    \
     
     \ /
      Last update: 2018-01-14 23:21    [W:4.547 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site