| Message ID | E1VMm13-0007hO-9l@rmk-PC.arm.linux.org.uk |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On 09/19/2013 11:44 PM, Russell King wrote: > Replace the following sequence: > > dma_set_mask(dev, mask); > dma_set_coherent_mask(dev, mask); > > with a call to the new helper dma_set_mask_and_coherent(). > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Regards, Hans > --- > drivers/staging/media/dt3155v4l/dt3155v4l.c | 5 +---- > 1 files changed, 1 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c > index 90d6ac4..081407b 100644 > --- a/drivers/staging/media/dt3155v4l/dt3155v4l.c > +++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c > @@ -901,10 +901,7 @@ dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id) > int err; > struct dt3155_priv *pd; > > - err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); > - if (err) > - return -ENODEV; > - err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); > + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); > if (err) > return -ENODEV; > pd = kzalloc(sizeof(*pd), GFP_KERNEL); > -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Russell, Em Mon, 30 Sep 2013 13:57:47 +0200 Hans Verkuil <hverkuil@xs4all.nl> escreveu: > On 09/19/2013 11:44 PM, Russell King wrote: > > Replace the following sequence: > > > > dma_set_mask(dev, mask); > > dma_set_coherent_mask(dev, mask); > > > > with a call to the new helper dma_set_mask_and_coherent(). > > > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > > Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Somehow, I lost your original post (I got unsubscribed on a few days from all vger mailing lists at the end of september). I suspect that you want to sent this via your tree, right? If so: Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com> > > Regards, > > Hans > > > --- > > drivers/staging/media/dt3155v4l/dt3155v4l.c | 5 +---- > > 1 files changed, 1 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c > > index 90d6ac4..081407b 100644 > > --- a/drivers/staging/media/dt3155v4l/dt3155v4l.c > > +++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c > > @@ -901,10 +901,7 @@ dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id) > > int err; > > struct dt3155_priv *pd; > > > > - err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); > > - if (err) > > - return -ENODEV; > > - err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); > > + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); > > if (err) > > return -ENODEV; > > pd = kzalloc(sizeof(*pd), GFP_KERNEL); > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Oct 31, 2013 at 09:46:40AM -0200, Mauro Carvalho Chehab wrote: > Hi Russell, > > Em Mon, 30 Sep 2013 13:57:47 +0200 > Hans Verkuil <hverkuil@xs4all.nl> escreveu: > > > On 09/19/2013 11:44 PM, Russell King wrote: > > > Replace the following sequence: > > > > > > dma_set_mask(dev, mask); > > > dma_set_coherent_mask(dev, mask); > > > > > > with a call to the new helper dma_set_mask_and_coherent(). > > > > > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > > > > Acked-by: Hans Verkuil <hans.verkuil@cisco.com> > > Somehow, I lost your original post (I got unsubscribed on a few days > from all vger mailing lists at the end of september). > > I suspect that you want to sent this via your tree, right? Yes please. > If so: > > Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Added, thanks. > > > - err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); > > > - if (err) > > > - return -ENODEV; > > > - err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); > > > + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); > > > if (err) > > > return -ENODEV; One thing I've just noticed is that return should be "return err" not "return -ENODEV" - are you okay for me to change that in this patch? Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c index 90d6ac4..081407b 100644 --- a/drivers/staging/media/dt3155v4l/dt3155v4l.c +++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c @@ -901,10 +901,7 @@ dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id) int err; struct dt3155_priv *pd; - err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); - if (err) - return -ENODEV; - err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); if (err) return -ENODEV; pd = kzalloc(sizeof(*pd), GFP_KERNEL);
Replace the following sequence: dma_set_mask(dev, mask); dma_set_coherent_mask(dev, mask); with a call to the new helper dma_set_mask_and_coherent(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- drivers/staging/media/dt3155v4l/dt3155v4l.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)