Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56a826c1 authored by Mitchel Humpherys's avatar Mitchel Humpherys Committed by Patrick Daly
Browse files

arm64: dma-mapping: make dma_ops const 



dma_ops should be const since they shouldn't be changing after being
defined (there's even a checkpatch warning for this). Convert existing
dma_ops to const.

Change-Id: Ic27ba9a0832b12cae43cd45c72f053335845fd8f
Signed-off-by: default avatarMitchel Humpherys <mitchelh@codeaurora.org>
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent aa709002

arch/arm64/include/asm/device.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define __ASM_DEVICE_H



struct dev_archdata {

	struct dma_map_ops *dma_ops;

	const struct dma_map_ops *dma_ops;

#ifdef CONFIG_IOMMU_API

	void *iommu;			/* private IOMMU data */

#endif

arch/arm64/include/asm/dma-mapping.h

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define DMA_ERROR_CODE	(~(dma_addr_t)0)

extern struct dma_map_ops dummy_dma_ops;



static inline struct dma_map_ops *__generic_dma_ops(struct device *dev)

static inline const struct dma_map_ops *__generic_dma_ops(struct device *dev)

{

	if (dev && dev->archdata.dma_ops)

		return dev->archdata.dma_ops;
@@ -39,7 +39,7 @@ static inline struct dma_map_ops *__generic_dma_ops(struct device *dev) 
	return &dummy_dma_ops;

}



static inline struct dma_map_ops *get_dma_ops(struct device *dev)

static inline const struct dma_map_ops *get_dma_ops(struct device *dev)

{

	if (xen_initial_domain())

		return xen_dma_ops;

include/linux/dma-mapping.h

+16 −16
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr, 
					      enum dma_data_direction dir,

					      unsigned long attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);

	dma_addr_t addr;



	kmemcheck_mark_initialized(ptr, size);
@@ -200,7 +200,7 @@ static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr, 
					  enum dma_data_direction dir,

					  unsigned long attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!valid_dma_direction(dir));

	if (ops->unmap_page)
@@ -216,7 +216,7 @@ static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg, 
				   int nents, enum dma_data_direction dir,

				   unsigned long attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);

	int i, ents;

	struct scatterlist *s;
@@ -234,7 +234,7 @@ static inline void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg 
				      int nents, enum dma_data_direction dir,

				      unsigned long attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!valid_dma_direction(dir));

	debug_dma_unmap_sg(dev, sg, nents, dir);
@@ -246,7 +246,7 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page, 
				      size_t offset, size_t size,

				      enum dma_data_direction dir)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);

	dma_addr_t addr;



	kmemcheck_mark_initialized(page_address(page) + offset, size);
@@ -260,7 +260,7 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page, 
static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,

				  size_t size, enum dma_data_direction dir)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!valid_dma_direction(dir));

	if (ops->unmap_page)
@@ -272,7 +272,7 @@ static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr, 
					   size_t size,

					   enum dma_data_direction dir)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!valid_dma_direction(dir));

	if (ops->sync_single_for_cpu)
@@ -284,7 +284,7 @@ static inline void dma_sync_single_for_device(struct device *dev, 
					      dma_addr_t addr, size_t size,

					      enum dma_data_direction dir)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!valid_dma_direction(dir));

	if (ops->sync_single_for_device)
@@ -324,7 +324,7 @@ static inline void 
dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,

		    int nelems, enum dma_data_direction dir)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!valid_dma_direction(dir));

	if (ops->sync_sg_for_cpu)
@@ -336,7 +336,7 @@ static inline void 
dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,

		       int nelems, enum dma_data_direction dir)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!valid_dma_direction(dir));

	if (ops->sync_sg_for_device)
@@ -380,7 +380,7 @@ static inline int 
dma_mmap_attrs(struct device *dev, struct vm_area_struct *vma, void *cpu_addr,

	       dma_addr_t dma_addr, size_t size, unsigned long attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);

	BUG_ON(!ops);

	if (ops->mmap)

		return ops->mmap(dev, vma, cpu_addr, dma_addr, size, attrs);
@@ -398,7 +398,7 @@ dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr, 
		      dma_addr_t dma_addr, size_t size,

		      unsigned long attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);

	BUG_ON(!ops);

	if (ops->get_sgtable)

		return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
@@ -416,7 +416,7 @@ static inline void *dma_alloc_attrs(struct device *dev, size_t size, 
				       dma_addr_t *dma_handle, gfp_t flag,

				       unsigned long attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);

	void *cpu_addr;



	BUG_ON(!ops);
@@ -438,7 +438,7 @@ static inline void dma_free_attrs(struct device *dev, size_t size, 
				     void *cpu_addr, dma_addr_t dma_handle,

				     unsigned long attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!ops);

	WARN_ON(irqs_disabled());
@@ -496,7 +496,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) 
#ifndef HAVE_ARCH_DMA_SUPPORTED

static inline int dma_supported(struct device *dev, u64 mask)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);



	if (!ops)

		return 0;
@@ -509,7 +509,7 @@ static inline int dma_supported(struct device *dev, u64 mask) 
#ifndef HAVE_ARCH_DMA_SET_MASK

static inline int dma_set_mask(struct device *dev, u64 mask)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	const struct dma_map_ops *ops = get_dma_ops(dev);



	if (ops->set_dma_mask)

		return ops->set_dma_mask(dev, mask);