lkml.org 
[lkml]   [2022]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] media: pt3: Use dma_set_mask_and_coherent() and simplify code
From
Date
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  drivers/media/pci/pt3/pt3.c | 16 ++++------------
>  1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/media/pci/pt3/pt3.c
> b/drivers/media/pci/pt3/pt3.c
> index 0d51bdf01f43..11f26cac0abc 100644
> --- a/drivers/media/pci/pt3/pt3.c
> +++ b/drivers/media/pci/pt3/pt3.c
> @@ -707,18 +707,10 @@ static int pt3_probe(struct pci_dev *pdev,
> const struct pci_device_id *ent)
>         if (ret < 0)
>                 return ret;
>  
> -       ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
> -       if (ret == 0)
> -               dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
> -       else {
> -               ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
> -               if (ret == 0)
> -                       dma_set_coherent_mask(&pdev->dev,
> DMA_BIT_MASK(32));
> -               else {
> -                       dev_err(&pdev->dev, "Failed to set DMA
> mask\n");
> -                       return ret;
> -               }
> -               dev_info(&pdev->dev, "Use 32bit DMA\n");
> +       ret = dma_set_mask_and_coherent(&pdev->dev,
> DMA_BIT_MASK(64));
> +       if (ret) {
> +               dev_err(&pdev->dev, "Failed to set DMA mask\n");
> +               return ret;
>         }
>  
>         pt3 = devm_kzalloc(&pdev->dev, sizeof(*pt3), GFP_KERNEL);

tested on x86_64.

Acked-by: Akihiro Tsukada <tskd08@gmail.com>

\
 
 \ /
  Last update: 2022-01-03 16:59    [W:0.054 / U:0.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site