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

Commit ac1820fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-next-dma_ops' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma 

Pull rdma DMA mapping updates from Doug Ledford:
 "Drop IB DMA mapping code and use core DMA code instead.

  Bart Van Assche noted that the ib DMA mapping code was significantly
  similar enough to the core DMA mapping code that with a few changes it
  was possible to remove the IB DMA mapping code entirely and switch the
  RDMA stack to use the core DMA mapping code.

  This resulted in a nice set of cleanups, but touched the entire tree
  and has been kept separate for that reason."

* tag 'for-next-dma_ops' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (37 commits)
  IB/rxe, IB/rdmavt: Use dma_virt_ops instead of duplicating it
  IB/core: Remove ib_device.dma_device
  nvme-rdma: Switch from dma_device to dev.parent
  RDS: net: Switch from dma_device to dev.parent
  IB/srpt: Modify a debug statement
  IB/srp: Switch from dma_device to dev.parent
  IB/iser: Switch from dma_device to dev.parent
  IB/IPoIB: Switch from dma_device to dev.parent
  IB/rxe: Switch from dma_device to dev.parent
  IB/vmw_pvrdma: Switch from dma_device to dev.parent
  IB/usnic: Switch from dma_device to dev.parent
  IB/qib: Switch from dma_device to dev.parent
  IB/qedr: Switch from dma_device to dev.parent
  IB/ocrdma: Switch from dma_device to dev.parent
  IB/nes: Remove a superfluous assignment statement
  IB/mthca: Switch from dma_device to dev.parent
  IB/mlx5: Switch from dma_device to dev.parent
  IB/mlx4: Switch from dma_device to dev.parent
  IB/i40iw: Remove a superfluous assignment statement
  IB/hns: Switch from dma_device to dev.parent
  ...
parents edccb594 0bbb3b74

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

+2 −2
Original line number Diff line number Diff line 
#ifndef _ALPHA_DMA_MAPPING_H

#define _ALPHA_DMA_MAPPING_H



extern struct dma_map_ops *dma_ops;

extern const struct dma_map_ops *dma_ops;



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

static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)

{

	return dma_ops;

}

arch/alpha/kernel/pci-noop.c

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static int alpha_noop_supported(struct device *dev, u64 mask) 
	return mask < 0x00ffffffUL ? 0 : 1;

}



struct dma_map_ops alpha_noop_ops = {

const struct dma_map_ops alpha_noop_ops = {

	.alloc			= alpha_noop_alloc_coherent,

	.free			= dma_noop_free_coherent,

	.map_page		= dma_noop_map_page,
@@ -137,5 +137,5 @@ struct dma_map_ops alpha_noop_ops = { 
	.dma_supported		= alpha_noop_supported,

};



struct dma_map_ops *dma_ops = &alpha_noop_ops;

const struct dma_map_ops *dma_ops = &alpha_noop_ops;

EXPORT_SYMBOL(dma_ops);

arch/alpha/kernel/pci_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ static int alpha_pci_mapping_error(struct device *dev, dma_addr_t dma_addr) 
	return dma_addr == 0;

}



struct dma_map_ops alpha_pci_ops = {

const struct dma_map_ops alpha_pci_ops = {

	.alloc			= alpha_pci_alloc_coherent,

	.free			= alpha_pci_free_coherent,

	.map_page		= alpha_pci_map_page,
@@ -950,5 +950,5 @@ struct dma_map_ops alpha_pci_ops = { 
	.dma_supported		= alpha_pci_supported,

};



struct dma_map_ops *dma_ops = &alpha_pci_ops;

const struct dma_map_ops *dma_ops = &alpha_pci_ops;

EXPORT_SYMBOL(dma_ops);

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

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ 
#include <plat/dma.h>

#endif



extern struct dma_map_ops arc_dma_ops;

extern const struct dma_map_ops arc_dma_ops;



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

static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)

{

	return &arc_dma_ops;

}

arch/arc/mm/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int arc_dma_supported(struct device *dev, u64 dma_mask) 
	return dma_mask == DMA_BIT_MASK(32);

}



struct dma_map_ops arc_dma_ops = {

const struct dma_map_ops arc_dma_ops = {

	.alloc			= arc_dma_alloc,

	.free			= arc_dma_free,

	.mmap			= arc_dma_mmap,