From: Mauro Carvalho Chehab <m.chehab@samsung.com>
To: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Joe Perches <joe@perches.com>,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org
Subject: Re: [PATCH 07/22] media: Use pci_zalloc_consistent
Date: Fri, 27 Jun 2014 07:55:20 -0300 [thread overview]
Message-ID: <20140627075520.19af50ff.m.chehab@samsung.com> (raw)
In-Reply-To: <53AD2951.5040903@xs4all.nl>
Em Fri, 27 Jun 2014 10:20:33 +0200
Hans Verkuil <hverkuil@xs4all.nl> escreveu:
> Hi Joe,
>
> For the media subsystem:
>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Err... I would rather prefer to apply this patch on our subsystem, in order
to avoid potential conflicts with other patches. Not really a big deal, as
those drivers aren't being touched for a while, but who knows what patches
may appear for them up to the next merge tree?
Regards,
Mauro
>
> Regards,
>
> Hans
>
> On 06/23/2014 03:41 PM, Joe Perches wrote:
> > Remove the now unnecessary memset too.
> >
> > Signed-off-by: Joe Perches <joe@perches.com>
> > ---
> > drivers/media/common/saa7146/saa7146_core.c | 15 ++++++---------
> > drivers/media/common/saa7146/saa7146_fops.c | 5 +++--
> > drivers/media/pci/bt8xx/bt878.c | 16 ++++------------
> > drivers/media/pci/ngene/ngene-core.c | 7 +++----
> > drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 11 +++--------
> > drivers/media/usb/ttusb-dec/ttusb_dec.c | 11 +++--------
> > 6 files changed, 22 insertions(+), 43 deletions(-)
> >
> > diff --git a/drivers/media/common/saa7146/saa7146_core.c b/drivers/media/common/saa7146/saa7146_core.c
> > index 34b0d0d..97afee6 100644
> > --- a/drivers/media/common/saa7146/saa7146_core.c
> > +++ b/drivers/media/common/saa7146/saa7146_core.c
> > @@ -421,23 +421,20 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
> > err = -ENOMEM;
> >
> > /* get memory for various stuff */
> > - dev->d_rps0.cpu_addr = pci_alloc_consistent(pci, SAA7146_RPS_MEM,
> > - &dev->d_rps0.dma_handle);
> > + dev->d_rps0.cpu_addr = pci_zalloc_consistent(pci, SAA7146_RPS_MEM,
> > + &dev->d_rps0.dma_handle);
> > if (!dev->d_rps0.cpu_addr)
> > goto err_free_irq;
> > - memset(dev->d_rps0.cpu_addr, 0x0, SAA7146_RPS_MEM);
> >
> > - dev->d_rps1.cpu_addr = pci_alloc_consistent(pci, SAA7146_RPS_MEM,
> > - &dev->d_rps1.dma_handle);
> > + dev->d_rps1.cpu_addr = pci_zalloc_consistent(pci, SAA7146_RPS_MEM,
> > + &dev->d_rps1.dma_handle);
> > if (!dev->d_rps1.cpu_addr)
> > goto err_free_rps0;
> > - memset(dev->d_rps1.cpu_addr, 0x0, SAA7146_RPS_MEM);
> >
> > - dev->d_i2c.cpu_addr = pci_alloc_consistent(pci, SAA7146_RPS_MEM,
> > - &dev->d_i2c.dma_handle);
> > + dev->d_i2c.cpu_addr = pci_zalloc_consistent(pci, SAA7146_RPS_MEM,
> > + &dev->d_i2c.dma_handle);
> > if (!dev->d_i2c.cpu_addr)
> > goto err_free_rps1;
> > - memset(dev->d_i2c.cpu_addr, 0x0, SAA7146_RPS_MEM);
> >
> > /* the rest + print status message */
> >
> > diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c
> > index eda01bc..a776a80 100644
> > --- a/drivers/media/common/saa7146/saa7146_fops.c
> > +++ b/drivers/media/common/saa7146/saa7146_fops.c
> > @@ -520,14 +520,15 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
> > configuration data) */
> > dev->ext_vv_data = ext_vv;
> >
> > - vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);
> > + vv->d_clipping.cpu_addr =
> > + pci_zalloc_consistent(dev->pci, SAA7146_CLIPPING_MEM,
> > + &vv->d_clipping.dma_handle);
> > if( NULL == vv->d_clipping.cpu_addr ) {
> > ERR("out of memory. aborting.\n");
> > kfree(vv);
> > v4l2_ctrl_handler_free(hdl);
> > return -1;
> > }
> > - memset(vv->d_clipping.cpu_addr, 0x0, SAA7146_CLIPPING_MEM);
> >
> > saa7146_video_uops.init(dev,vv);
> > if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
> > diff --git a/drivers/media/pci/bt8xx/bt878.c b/drivers/media/pci/bt8xx/bt878.c
> > index d0c281f..1176583 100644
> > --- a/drivers/media/pci/bt8xx/bt878.c
> > +++ b/drivers/media/pci/bt8xx/bt878.c
> > @@ -101,28 +101,20 @@ static int bt878_mem_alloc(struct bt878 *bt)
> > if (!bt->buf_cpu) {
> > bt->buf_size = 128 * 1024;
> >
> > - bt->buf_cpu =
> > - pci_alloc_consistent(bt->dev, bt->buf_size,
> > - &bt->buf_dma);
> > -
> > + bt->buf_cpu = pci_zalloc_consistent(bt->dev, bt->buf_size,
> > + &bt->buf_dma);
> > if (!bt->buf_cpu)
> > return -ENOMEM;
> > -
> > - memset(bt->buf_cpu, 0, bt->buf_size);
> > }
> >
> > if (!bt->risc_cpu) {
> > bt->risc_size = PAGE_SIZE;
> > - bt->risc_cpu =
> > - pci_alloc_consistent(bt->dev, bt->risc_size,
> > - &bt->risc_dma);
> > -
> > + bt->risc_cpu = pci_zalloc_consistent(bt->dev, bt->risc_size,
> > + &bt->risc_dma);
> > if (!bt->risc_cpu) {
> > bt878_mem_free(bt);
> > return -ENOMEM;
> > }
> > -
> > - memset(bt->risc_cpu, 0, bt->risc_size);
> > }
> >
> > return 0;
> > diff --git a/drivers/media/pci/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c
> > index 970e833..37dc149 100644
> > --- a/drivers/media/pci/ngene/ngene-core.c
> > +++ b/drivers/media/pci/ngene/ngene-core.c
> > @@ -1078,12 +1078,11 @@ static int AllocCommonBuffers(struct ngene *dev)
> > dev->ngenetohost = dev->FWInterfaceBuffer + 256;
> > dev->EventBuffer = dev->FWInterfaceBuffer + 512;
> >
> > - dev->OverflowBuffer = pci_alloc_consistent(dev->pci_dev,
> > - OVERFLOW_BUFFER_SIZE,
> > - &dev->PAOverflowBuffer);
> > + dev->OverflowBuffer = pci_zalloc_consistent(dev->pci_dev,
> > + OVERFLOW_BUFFER_SIZE,
> > + &dev->PAOverflowBuffer);
> > if (!dev->OverflowBuffer)
> > return -ENOMEM;
> > - memset(dev->OverflowBuffer, 0, OVERFLOW_BUFFER_SIZE);
> >
> > for (i = STREAM_VIDEOIN1; i < MAX_STREAM; i++) {
> > int type = dev->card_info->io_type[i];
> > diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
> > index f8a60c1..0d3194a 100644
> > --- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
> > +++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
> > @@ -804,11 +804,9 @@ static int ttusb_alloc_iso_urbs(struct ttusb *ttusb)
> > {
> > int i;
> >
> > - ttusb->iso_buffer = pci_alloc_consistent(NULL,
> > - ISO_FRAME_SIZE *
> > - FRAMES_PER_ISO_BUF *
> > - ISO_BUF_COUNT,
> > - &ttusb->iso_dma_handle);
> > + 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",
> > @@ -816,9 +814,6 @@ static int ttusb_alloc_iso_urbs(struct ttusb *ttusb)
> > return -ENOMEM;
> > }
> >
> > - memset(ttusb->iso_buffer, 0,
> > - ISO_FRAME_SIZE * FRAMES_PER_ISO_BUF * ISO_BUF_COUNT);
> > -
> > for (i = 0; i < ISO_BUF_COUNT; i++) {
> > struct urb *urb;
> >
> > diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
> > index 29724af..15ab584 100644
> > --- a/drivers/media/usb/ttusb-dec/ttusb_dec.c
> > +++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c
> > @@ -1151,11 +1151,9 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec)
> >
> > dprintk("%s\n", __func__);
> >
> > - dec->iso_buffer = pci_alloc_consistent(NULL,
> > - ISO_FRAME_SIZE *
> > - (FRAMES_PER_ISO_BUF *
> > - ISO_BUF_COUNT),
> > - &dec->iso_dma_handle);
> > + dec->iso_buffer = pci_zalloc_consistent(NULL,
> > + ISO_FRAME_SIZE * (FRAMES_PER_ISO_BUF * ISO_BUF_COUNT),
> > + &dec->iso_dma_handle);
> >
> > if (!dec->iso_buffer) {
> > dprintk("%s: pci_alloc_consistent - not enough memory\n",
> > @@ -1163,9 +1161,6 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec)
> > return -ENOMEM;
> > }
> >
> > - memset(dec->iso_buffer, 0,
> > - ISO_FRAME_SIZE * (FRAMES_PER_ISO_BUF * ISO_BUF_COUNT));
> > -
> > for (i = 0; i < ISO_BUF_COUNT; i++) {
> > struct urb *urb;
> >
> >
next prev parent reply other threads:[~2014-06-27 10:55 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-23 13:41 [PATCH 00/22] Add and use pci_zalloc_consistent Joe Perches
2014-06-23 13:41 ` Joe Perches
2014-06-23 13:41 ` [PATCH 01/22] pci-dma-compat: Add pci_zalloc_consistent helper Joe Perches
2014-06-23 13:53 ` Arnd Bergmann
2014-06-23 14:03 ` Joe Perches
2014-06-25 19:27 ` Andrew Morton
2014-06-25 21:51 ` Joe Perches
2014-06-25 21:57 ` Andrew Morton
2014-06-25 22:14 ` Joe Perches
2014-06-25 22:31 ` David Miller
2014-06-23 13:41 ` [PATCH 02/22] atm: Use pci_zalloc_consistent Joe Perches
2014-06-23 13:41 ` [PATCH 03/22] block: " Joe Perches
2014-06-23 13:41 ` [PATCH 04/22] crypto: " Joe Perches
2014-06-23 13:41 ` [PATCH 05/22] infiniband: " Joe Perches
[not found] ` <ed5fb1adbe665a8e4a4e18bc316bab261bc55556.1403530604.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
2014-06-23 13:57 ` Steve Wise
2014-06-23 13:57 ` Steve Wise
2014-06-23 13:41 ` [PATCH 06/22] i810: " Joe Perches
2014-06-23 13:41 ` Joe Perches
2014-07-08 10:13 ` Daniel Vetter
2014-06-23 13:41 ` [PATCH 07/22] media: " Joe Perches
2014-06-27 8:20 ` Hans Verkuil
2014-06-27 10:55 ` Mauro Carvalho Chehab [this message]
2014-06-23 13:41 ` [PATCH 08/22] amd: " Joe Perches
2014-06-23 18:02 ` Don Fry
2014-06-23 19:15 ` Joe Perches
2014-06-23 21:05 ` [PATCH V2 " Joe Perches
2014-06-23 21:36 ` [PATCH] amd: Neaten and remove unnecessary OOM messages Joe Perches
2014-06-23 22:42 ` Don Fry
2014-06-25 23:32 ` David Miller
[not found] ` <20140625123523.b00c71c3a3f0a9129f9e6f3d@linux-foundation.org>
2014-06-25 23:40 ` [PATCH V2] checkpatch: Add test for blank lines after function/struct/union/enum declarations Joe Perches
2014-06-23 22:22 ` [PATCH V2 08/22] amd: Use pci_zalloc_consistent Don Fry
2014-06-25 4:49 ` Guenter Roeck
2014-06-25 4:59 ` Joe Perches
2014-06-25 23:55 ` [PATCH V2] pcnet32: Neaten and remove unnecessary OOM messages Joe Perches
2014-07-01 19:19 ` David Miller
2014-07-01 19:26 ` Joe Perches
2014-06-25 23:51 ` [PATCH V3 08/22] pcnet32: Use pci_zalloc_consistent Joe Perches
2014-06-23 13:41 ` [PATCH 09/22] atl1e: " Joe Perches
2014-06-23 13:41 ` [PATCH 10/22] enic: " Joe Perches
2014-06-26 6:27 ` Govindarajulu Varadarajan
2014-06-23 13:41 ` [PATCH 11/22] sky2: " Joe Perches
2014-06-23 13:41 ` [PATCH 12/22] micrel: " Joe Perches
2014-06-23 13:41 ` [PATCH 13/22] qlogic: " Joe Perches
2014-06-23 13:41 ` [PATCH 14/22] irda: " Joe Perches
2014-06-23 13:41 ` [PATCH 15/22] ipw2100: " Joe Perches
2014-06-23 13:41 ` [PATCH 16/22] mwl8k: " Joe Perches
2014-06-23 13:41 ` [PATCH 17/22] rtl818x: " Joe Perches
2014-06-23 13:41 ` [PATCH 18/22] rtlwifi: " Joe Perches
2014-06-23 13:41 ` [PATCH 19/22] scsi: " Joe Perches
2014-06-23 13:41 ` [PATCH 20/22] staging: " Joe Perches
2014-06-23 16:14 ` Greg Kroah-Hartman
2014-06-23 13:41 ` [PATCH 21/22] synclink_gt: " Joe Perches
2014-06-23 16:15 ` Greg Kroah-Hartman
2014-06-23 13:41 ` [PATCH 22/22] vme: bridges: " Joe Perches
2014-06-23 16:15 ` Greg Kroah-Hartman
2014-06-23 17:25 ` [PATCH 00/22] Add and use pci_zalloc_consistent Luis R. Rodriguez
2014-06-23 17:25 ` Luis R. Rodriguez
2014-06-23 19:13 ` Joe Perches
2014-06-23 19:13 ` Joe Perches
2014-06-23 23:27 ` Julian Calaby
2014-06-23 23:48 ` Joe Perches
2014-06-24 5:24 ` Julia Lawall
2014-06-24 7:15 ` Joe Perches
2014-06-24 12:11 ` Julia Lawall
2014-06-24 11:32 ` Johannes Berg
2014-06-23 21:49 ` David Miller
2014-06-23 21:49 ` David Miller
2014-06-25 19:41 ` John W. Linville
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=20140627075520.19af50ff.m.chehab@samsung.com \
--to=m.chehab@samsung.com \
--cc=hverkuil@xs4all.nl \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.