From: Christoph Hellwig <hch@lst.de>
To: Bjorn Helgaas <bhelgaas@google.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-pci@vger.kernel.org, linux-media@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] media/ttusb-dev: remove pci_zalloc_coherent abuse
Date: Tue, 9 Jan 2018 21:39:38 +0100 [thread overview]
Message-ID: <20180109203939.5930-3-hch@lst.de> (raw)
In-Reply-To: <20180109203939.5930-1-hch@lst.de>
Switch to a plain kzalloc instea of pci_zalloc_coherent to allocate
memory for the USB DMA.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/media/usb/ttusb-dec/ttusb_dec.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
index cdefb5dfbbdc..794ea8a78181 100644
--- a/drivers/media/usb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c
@@ -127,7 +127,6 @@ struct ttusb_dec {
struct urb *irq_urb;
dma_addr_t irq_dma_handle;
void *iso_buffer;
- dma_addr_t iso_dma_handle;
struct urb *iso_urb[ISO_BUF_COUNT];
int iso_stream_count;
struct mutex iso_mutex;
@@ -1185,11 +1184,7 @@ static void ttusb_dec_free_iso_urbs(struct ttusb_dec *dec)
for (i = 0; i < ISO_BUF_COUNT; i++)
usb_free_urb(dec->iso_urb[i]);
-
- pci_free_consistent(NULL,
- ISO_FRAME_SIZE * (FRAMES_PER_ISO_BUF *
- ISO_BUF_COUNT),
- dec->iso_buffer, dec->iso_dma_handle);
+ kfree(dec->iso_buffer);
}
static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec)
@@ -1198,10 +1193,8 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec)
dprintk("%s\n", __func__);
- dec->iso_buffer = pci_zalloc_consistent(NULL,
- ISO_FRAME_SIZE * (FRAMES_PER_ISO_BUF * ISO_BUF_COUNT),
- &dec->iso_dma_handle);
-
+ dec->iso_buffer = kzalloc(ISO_FRAME_SIZE *
+ (FRAMES_PER_ISO_BUF * ISO_BUF_COUNT), GFP_KERNEL);
if (!dec->iso_buffer) {
dprintk("%s: pci_alloc_consistent - not enough memory\n",
__func__);
--
2.14.2
next prev parent reply other threads:[~2018-01-09 20:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-09 20:39 remove pci_dma_* abuses and workarounds Christoph Hellwig
2018-01-09 20:39 ` [PATCH 1/3] media/ttusb-budget: remove pci_zalloc_coherent abuse Christoph Hellwig
2018-01-09 20:49 ` Joe Perches
2018-01-10 8:17 ` Christoph Hellwig
2018-01-09 23:45 ` Bjorn Helgaas
2018-01-09 20:39 ` Christoph Hellwig [this message]
2018-01-09 20:39 ` [PATCH 3/3] pci-dma-compat: remove handling of NULL pdev arguments Christoph Hellwig
2018-01-10 0:25 ` Bjorn Helgaas
2018-01-10 8:14 ` Christoph Hellwig
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=20180109203939.5930-3-hch@lst.de \
--to=hch@lst.de \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mchehab@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