From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932672AbcFJK0y (ORCPT ); Fri, 10 Jun 2016 06:26:54 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:12585 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753090AbcFJKM0 (ORCPT ); Fri, 10 Jun 2016 06:12:26 -0400 X-AuditID: cbfec7f5-f792a6d000001302-6a-575a9285ea13 From: Krzysztof Kozlowski To: Andrew Morton Cc: hch@infradead.org, Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Richard Henderson , Ivan Kokshaysky , Matt Turner , Max Filippov , Guenter Roeck , Valentin Rothberg , Christian Borntraeger , Andy Lutomirski , Joerg Roedel , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 02/44] alpha: dma-mapping: Use unsigned long for dma_attrs Date: Fri, 10 Jun 2016 12:11:19 +0200 Message-id: <1465553521-27303-3-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1465553521-27303-1-git-send-email-k.kozlowski@samsung.com> References: <1465553521-27303-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t/xa7qtk6LCDRa1C1vMWb+GzWLjjPWs FtNXbGexOD1hEZPFv1MbmS2+PVzIaDH51Fwmi9cvDC3e3T3CaHF51xw2iycLzzBZnN+1ltXi 0+2DzBbTTt0BsprbmB34PQ4+OsTmsXPWXXaPzSu0PP6fjfLYtKqTzePEjN8sHju/N7B79G1Z xeix+XS1R9/0D8wenzfJBXBHcdmkpOZklqUW6dslcGUcnniTsWCSbMW51cENjBvFuxg5OSQE TCS27TjLCGGLSVy4t56ti5GLQ0hgKaPE6dW3WUESQgKNTBKHPyaC2GwCxhKbly9hA7FFBHQl Vj3fxQzSwCywiEXi8dcHQAkODmEBX4k/HQIgNSwCqhItN7vBFvAKuEv8eL6SFWKZnMTJY5PB bE4BD4nuuzNZIHa5S2x/8oppAiPvAkaGVYyiqaXJBcVJ6blGesWJucWleel6yfm5mxghYf11 B+PSY1aHGAU4GJV4eCN2RYYLsSaWFVfmHmKU4GBWEuG16IsKF+JNSaysSi3Kjy8qzUktPsQo zcGiJM47c9f7ECGB9MSS1OzU1ILUIpgsEwenVANj/cFjJ/RanrM4/lvkyFh/JTJX4821lGuH Zj9UV+uxDj651b3VJ/F8ScCLgGULd5eJL7kpI82+4mtUqmgRz9w3Qn9XHkl8YvkuTomn0Zc5 omJSVOrVxSePu7jmKHeVTxJtjZ73ZnbfjOUvDzT8jvr0cy/nOS3zt6m8ucsSuzvW/5cLyGF2 NVdQYinOSDTUYi4qTgQALevJy2cCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Split out subsystem specific changes for easier reviews. This will be squashed with main commit. Signed-off-by: Krzysztof Kozlowski --- arch/alpha/include/asm/dma-mapping.h | 2 -- arch/alpha/kernel/pci-noop.c | 2 +- arch/alpha/kernel/pci_iommu.c | 12 ++++++------ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h index 3c3451f58ff4..c63b6ac19ee5 100644 --- a/arch/alpha/include/asm/dma-mapping.h +++ b/arch/alpha/include/asm/dma-mapping.h @@ -1,8 +1,6 @@ #ifndef _ALPHA_DMA_MAPPING_H #define _ALPHA_DMA_MAPPING_H -#include - extern struct dma_map_ops *dma_ops; static inline struct dma_map_ops *get_dma_ops(struct device *dev) diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c index 8e735b5e56bd..bb152e21e5ae 100644 --- a/arch/alpha/kernel/pci-noop.c +++ b/arch/alpha/kernel/pci-noop.c @@ -109,7 +109,7 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn, static void *alpha_noop_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, - struct dma_attrs *attrs) + unsigned long attrs) { void *ret; diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 8969bf2dfe3a..451fc9cdd323 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -349,7 +349,7 @@ static struct pci_dev *alpha_gendev_to_pci(struct device *dev) static dma_addr_t alpha_pci_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { struct pci_dev *pdev = alpha_gendev_to_pci(dev); int dac_allowed; @@ -369,7 +369,7 @@ static dma_addr_t alpha_pci_map_page(struct device *dev, struct page *page, static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { unsigned long flags; struct pci_dev *pdev = alpha_gendev_to_pci(dev); @@ -433,7 +433,7 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr, static void *alpha_pci_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addrp, gfp_t gfp, - struct dma_attrs *attrs) + unsigned long attrs) { struct pci_dev *pdev = alpha_gendev_to_pci(dev); void *cpu_addr; @@ -478,7 +478,7 @@ try_again: static void alpha_pci_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_addr, - struct dma_attrs *attrs) + unsigned long attrs) { struct pci_dev *pdev = alpha_gendev_to_pci(dev); pci_unmap_single(pdev, dma_addr, size, PCI_DMA_BIDIRECTIONAL); @@ -651,7 +651,7 @@ sg_fill(struct device *dev, struct scatterlist *leader, struct scatterlist *end, static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { struct pci_dev *pdev = alpha_gendev_to_pci(dev); struct scatterlist *start, *end, *out; @@ -729,7 +729,7 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg, static void alpha_pci_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction dir, - struct dma_attrs *attrs) + unsigned long attrs) { struct pci_dev *pdev = alpha_gendev_to_pci(dev); unsigned long flags; -- 1.9.1