From patchwork Wed Jul 29 18:07:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Upadhyay X-Patchwork-Id: 11691587 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F0E9F6C1 for ; Wed, 29 Jul 2020 18:07:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D01EF2075F for ; Wed, 29 Jul 2020 18:07:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UlDkrCz5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726947AbgG2SHi (ORCPT ); Wed, 29 Jul 2020 14:07:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726365AbgG2SHi (ORCPT ); Wed, 29 Jul 2020 14:07:38 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17224C061794; Wed, 29 Jul 2020 11:07:38 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id d4so14695856pgk.4; Wed, 29 Jul 2020 11:07:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=1Krxl1GvFbA1WWD9zXx5UhETQ4OJ61M+EH3cH8paiuk=; b=UlDkrCz5awqZE0HM0RaCzHfiq0jfLK0AXl6ZeG0o0voJ8ynShSEAZwEiChOHJrNHZB wICpuZpxZ6AjcNfygmgRHR2EeMGhnWl2Con4e0OUjgb7m/fL10YjgeRaYtL8VDXzwy4I U2gzW40r1PcsOvsTWNJ6NdILKgSXEfVehzFYshg3lQKXv4ZgI/g43MCR1drmNpJoj8en JMUMXU4aanI3OlyROTeY26gWAUGeh4DIOqsJlYM706LnHnYX0FVKl8wXaAWSjnKBz/qg wwbfcWA8lN4P51Ftuoex1E+WtoQoXgmgkiLfSGIUJKUQVnCplTXvv8QfhCn50TzfCgIT g2+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=1Krxl1GvFbA1WWD9zXx5UhETQ4OJ61M+EH3cH8paiuk=; b=dXKOT6qSYIGzia9k7vLElrCPhnvcmFh57NSghFEoH1H1Yip3iwsWNOXSbF0yL4QOcH eLGok8p1QHT1k/IORmL8i4r/+XDPT+mo7ndrAHtOvfvYSX3wSFe98V/bMxLx0CH6y8/9 fvgcOaooULZUa885yceSzrcd/RutDZ6JgSWaBZyZ9haA7uRunAdLifGzFG0qP5pUjaqd IHf374/Xvo6jE41X3u8PoOnoQIujZsKKiTN0X1DIiFxJB83GuupKdZX/KXNVwzqy8BDR rj2a87NmEHv5vTbv6wyjjGtfy6HPJBVknBpGPjpFrBIt+SSdaQK3n4NonEuBvLqxOkVw kNgw== X-Gm-Message-State: AOAM530c07jI/4a2F39WAh/ifYExGVKBEuy664MNZig/g+cqiUIIaFLM lvM2fWlE7hZtqzbhetsGGOE= X-Google-Smtp-Source: ABdhPJw58v3SyohfcCXwEq6Mo38cSFL91tCfPmYdtFXnR27muEdJYR5/suIWBqhJfAx+LqYXHzIybw== X-Received: by 2002:a63:6c1:: with SMTP id 184mr31367480pgg.262.1596046057615; Wed, 29 Jul 2020 11:07:37 -0700 (PDT) Received: from blackclown ([103.88.82.91]) by smtp.gmail.com with ESMTPSA id s18sm3109246pfd.132.2020.07.29.11.07.34 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 Jul 2020 11:07:36 -0700 (PDT) Date: Wed, 29 Jul 2020 23:37:24 +0530 From: Suraj Upadhyay To: jejb@linux.ibm.com, martin.petersen@oracle.com, hare@suse.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@linux-kernel.org Subject: [PATCH 2/7] scsi: aic7xxx: Remove pci-dma-compat wrapper APIs. Message-ID: <790a8751b5c2b5393c3021b8def08e47bb1597c0.1596045683.git.usuraj35@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The legacy API wrappers in include/linux/pci-dma-compat.h should go away as it creates unnecessary midlayering for include/linux/dma-mapping.h APIs. Instead use dma-mapping.h APIs directly. The patch has been generated with the coccinelle script below. And has been hand modified to replace each GFP_ with the correct flag depending upon the context. Compile-tested. @@@@ - PCI_DMA_BIDIRECTIONAL + DMA_BIDIRECTIONAL @@@@ - PCI_DMA_TODEVICE + DMA_TO_DEVICE @@@@ - PCI_DMA_FROMDEVICE + DMA_FROM_DEVICE @@@@ - PCI_DMA_NONE + DMA_NONE @@ expression E1, E2, E3; @@ - pci_alloc_consistent(E1, E2, E3) + dma_alloc_coherent(&E1->dev, E2, E3, GFP_) @@ expression E1, E2, E3; @@ - pci_zalloc_consistent(E1, E2, E3) + dma_alloc_coherent(&E1->dev, E2, E3, GFP_) @@ expression E1, E2, E3, E4; @@ - pci_free_consistent(E1, E2, E3, E4) + dma_free_coherent(&E1->dev, E2, E3, E4) @@ expression E1, E2, E3, E4; @@ - pci_map_single(E1, E2, E3, E4) + dma_map_single(&E1->dev, E2, E3, E4) @@ expression E1, E2, E3, E4; @@ - pci_unmap_single(E1, E2, E3, E4) + dma_unmap_single(&E1->dev, E2, E3, E4) @@ expression E1, E2, E3, E4, E5; @@ - pci_map_page(E1, E2, E3, E4, E5) + dma_map_page(&E1->dev, E2, E3, E4, E5) @@ expression E1, E2, E3, E4; @@ - pci_unmap_page(E1, E2, E3, E4) + dma_unmap_page(&E1->dev, E2, E3, E4) @@ expression E1, E2, E3, E4; @@ - pci_map_sg(E1, E2, E3, E4) + dma_map_sg(&E1->dev, E2, E3, E4) @@ expression E1, E2, E3, E4; @@ - pci_unmap_sg(E1, E2, E3, E4) + dma_unmap_sg(&E1->dev, E2, E3, E4) @@ expression E1, E2, E3, E4; @@ - pci_dma_sync_single_for_cpu(E1, E2, E3, E4) + dma_sync_single_for_cpu(&E1->dev, E2, E3, E4) @@ expression E1, E2, E3, E4; @@ - pci_dma_sync_single_for_device(E1, E2, E3, E4) + dma_sync_single_for_device(&E1->dev, E2, E3, E4) @@ expression E1, E2, E3, E4; @@ - pci_dma_sync_sg_for_cpu(E1, E2, E3, E4) + dma_sync_sg_for_cpu(&E1->dev, E2, E3, E4) @@ expression E1, E2, E3, E4; @@ - pci_dma_sync_sg_for_device(E1, E2, E3, E4) + dma_sync_sg_for_device(&E1->dev, E2, E3, E4) @@ expression E1, E2; @@ - pci_dma_mapping_error(E1, E2) + dma_mapping_error(&E1->dev, E2) @@ expression E1, E2; @@ - pci_set_consistent_dma_mask(E1, E2) + dma_set_coherent_mask(&E1->dev, E2) @@ expression E1, E2; @@ - pci_set_dma_mask(E1, E2) + dma_set_mask(&E1->dev, E2) Signed-off-by: Suraj Upadhyay --- drivers/scsi/aic7xxx/aic79xx_osm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index d019e3f2bb9b..7599eec08bf2 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c @@ -952,8 +952,8 @@ int ahd_dmamem_alloc(struct ahd_softc *ahd, bus_dma_tag_t dmat, void** vaddr, int flags, bus_dmamap_t *mapp) { - *vaddr = pci_alloc_consistent(ahd->dev_softc, - dmat->maxsize, mapp); + *vaddr = dma_alloc_coherent(&ahd->dev_softc->dev, dmat->maxsize, mapp, + GFP_ATOMIC); if (*vaddr == NULL) return (ENOMEM); return(0); @@ -963,8 +963,7 @@ void ahd_dmamem_free(struct ahd_softc *ahd, bus_dma_tag_t dmat, void* vaddr, bus_dmamap_t map) { - pci_free_consistent(ahd->dev_softc, dmat->maxsize, - vaddr, map); + dma_free_coherent(&ahd->dev_softc->dev, dmat->maxsize, vaddr, map); } int