[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAH_-1qyRsfFzm_F26WV4wSjMojTVQSdahASWTKXb7VgQPHHUNA@mail.gmail.com>
Date: Thu, 1 Jul 2021 14:26:30 -0700
From: Catherine Sullivan <csully@...gle.com>
To: Christophe JAILLET <christophe.jaillet@...adoo.fr>
Cc: Sagi Shahar <sagis@...gle.com>, Jon Olson <jonolson@...gle.com>,
David Miller <davem@...emloft.net>, kuba@...nel.org,
David Awogbemila <awogbemila@...gle.com>,
Willem de Bruijn <willemb@...gle.com>,
Yangchun Fu <yangchun@...gle.com>,
Bailey Forrest <bcf@...gle.com>, Kuo Zhao <kuozhao@...gle.com>,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
kernel-janitors@...r.kernel.org
Subject: Re: [PATCH net-next v2] gve: Simplify code and axe the use of a
deprecated API
On Thu, Jul 1, 2021 at 1:41 PM Christophe JAILLET
<christophe.jaillet@...adoo.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@...adoo.fr>
Reviewed-by: Catherine Sullivan <csully@...gle.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!
Powered by blists - more mailing lists