From: Christoph Hellwig <hch@lst.de>
To: Bjorn Helgaas <bhelgaas@google.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Kong Lai <kong.lai@tundra.com>,
linux-pci@vger.kernel.org, linux-media@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/4] media/ttusb-budget: remove pci_zalloc_coherent abuse
Date: Wed, 10 Jan 2018 19:03:19 +0100 [thread overview]
Message-ID: <20180110180322.30186-2-hch@lst.de> (raw)
In-Reply-To: <20180110180322.30186-1-hch@lst.de>
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
next prev parent reply other threads:[~2018-01-10 18:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-10 18:03 remove pci_dma_* abuses and workarounds V2 Christoph Hellwig
2018-01-10 18:03 ` Christoph Hellwig [this message]
2018-01-10 18:03 ` [PATCH 2/4] media/ttusb-dev: remove pci_zalloc_coherent abuse Christoph Hellwig
2018-01-10 18:03 ` [PATCH 3/4] tsi108_eth: use dma API properly Christoph Hellwig
2018-01-10 20:09 ` Andy Shevchenko
2018-01-15 15:11 ` Christoph Hellwig
2018-01-18 0:08 ` Bjorn Helgaas
2018-01-18 14:11 ` David Miller
2018-01-10 18:03 ` [PATCH 4/4] PCI: Remove NULL device handling from PCI DMA API Christoph Hellwig
2018-01-18 0:08 ` remove pci_dma_* abuses and workarounds V2 Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180110180322.30186-2-hch@lst.de \
--to=hch@lst.de \
--cc=bhelgaas@google.com \
--cc=kong.lai@tundra.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).