[PATCH net-next v2] gve: Simplify code and axe the use of a deprecated API

[PATCH net-next v2] gve: Simplify code and axe the use of a deprecated API

[Christophe JAILLET]

The wrappers in include/linux/pci-dma-compat.h should go away.

Replace 'pci_set_dma_mask/pci_set_consistent_dma_mask' by an equivalent
and less verbose 'dma_set_mask_and_coherent()' call.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
If needed, see post from Christoph Hellwig on the kernel-janitors ML:
   https://marc.info/?l=kernel-janitors&m=158745678307186&w=4

v2: Unchanged
    This patch was previously 3/3 of a serie
---
 drivers/net/ethernet/google/gve/gve_main.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
index c03984b26db4..099a2bc5ae67 100644
--- a/drivers/net/ethernet/google/gve/gve_main.c
+++ b/drivers/net/ethernet/google/gve/gve_main.c
@@ -1477,19 +1477,12 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	pci_set_master(pdev);
 
-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
+	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
 	if (err) {
 		dev_err(&pdev->dev, "Failed to set dma mask: err=%d\n", err);
 		goto abort_with_pci_region;
 	}
 
-	err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
-	if (err) {
-		dev_err(&pdev->dev,
-			"Failed to set consistent dma mask: err=%d\n", err);
-		goto abort_with_pci_region;
-	}
-
 	reg_bar = pci_iomap(pdev, GVE_REGISTER_BAR, 0);
 	if (!reg_bar) {
 		dev_err(&pdev->dev, "Failed to map pci bar!\n");
-- 
2.30.2

Re: [PATCH net-next v2] gve: Simplify code and axe the use of a deprecated API

[Catherine Sullivan]

On Thu, Jul 1, 2021 at 1:41 PM Christophe JAILLET
<christophe.jaillet@wanadoo.fr> wrote:
>
> The wrappers in include/linux/pci-dma-compat.h should go away.
>
> Replace 'pci_set_dma_mask/pci_set_consistent_dma_mask' by an equivalent
> and less verbose 'dma_set_mask_and_coherent()' call.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Reviewed-by: Catherine Sullivan <csully@google.com>

> ---
> If needed, see post from Christoph Hellwig on the kernel-janitors ML:
>    https://marc.info/?l=kernel-janitors&m=158745678307186&w=4
>
> v2: Unchanged
>     This patch was previously 3/3 of a serie
> ---
>  drivers/net/ethernet/google/gve/gve_main.c | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
>
> diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
> index c03984b26db4..099a2bc5ae67 100644
> --- a/drivers/net/ethernet/google/gve/gve_main.c
> +++ b/drivers/net/ethernet/google/gve/gve_main.c
> @@ -1477,19 +1477,12 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>
>         pci_set_master(pdev);
>
> -       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
> +       err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
>         if (err) {
>                 dev_err(&pdev->dev, "Failed to set dma mask: err=%d\n", err);
>                 goto abort_with_pci_region;
>         }
>
> -       err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
> -       if (err) {
> -               dev_err(&pdev->dev,
> -                       "Failed to set consistent dma mask: err=%d\n", err);
> -               goto abort_with_pci_region;
> -       }
> -
>         reg_bar = pci_iomap(pdev, GVE_REGISTER_BAR, 0);
>         if (!reg_bar) {
>                 dev_err(&pdev->dev, "Failed to map pci bar!\n");
> --
> 2.30.2
>

Thanks!

Re: [PATCH net-next v2] gve: Simplify code and axe the use of a deprecated API

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Thu,  1 Jul 2021 22:41:19 +0200 you wrote:
> The wrappers in include/linux/pci-dma-compat.h should go away.
> 
> Replace 'pci_set_dma_mask/pci_set_consistent_dma_mask' by an equivalent
> and less verbose 'dma_set_mask_and_coherent()' call.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> 
> [...]

Here is the summary with links:
  - [net-next,v2] gve: Simplify code and axe the use of a deprecated API
    https://git.kernel.org/netdev/net/c/bde3c8ffdd41

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html