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

Commit 344b512d authored by Rob Herring's avatar Rob Herring Committed by John Stultz
Browse files

UPSTREAM: of: Make of_dma_get_range() private 



of_dma_get_range() is only used within the DT core code, so remove the
export and move the header declaration to the private header.

Cc: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Tested-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
(cherry picked from commit 6e6faf63744333373db8bc64aea52dab86cbf0bc)
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Change-Id: I640da60a6eb57376039a070d134aa9278480e843
parent c6059ac6

drivers/of/address.c

+0 −1
Original line number Diff line number Diff line
@@ -991,7 +991,6 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz 


	return ret;

}

EXPORT_SYMBOL_GPL(of_dma_get_range);



/**

 * of_dma_is_coherent - Check if device is coherent

drivers/of/of_private.h

+11 −0
Original line number Diff line number Diff line
@@ -158,4 +158,15 @@ extern void __of_sysfs_remove_bin_file(struct device_node *np, 
#define for_each_transaction_entry_reverse(_oft, _te) \

	list_for_each_entry_reverse(_te, &(_oft)->te_list, node)



#ifdef CONFIG_OF_ADDRESS

extern int of_dma_get_range(struct device_node *np, u64 *dma_addr,

			    u64 *paddr, u64 *size);

#else

static inline int of_dma_get_range(struct device_node *np, u64 *dma_addr,

				   u64 *paddr, u64 *size)

{

	return -ENODEV;

}

#endif



#endif /* _LINUX_OF_PRIVATE_H */

include/linux/of_address.h

+0 −8
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ extern int of_pci_dma_range_parser_init(struct of_pci_range_parser *parser, 
extern struct of_pci_range *of_pci_range_parser_one(

					struct of_pci_range_parser *parser,

					struct of_pci_range *range);

extern int of_dma_get_range(struct device_node *np, u64 *dma_addr,

				u64 *paddr, u64 *size);

extern bool of_dma_is_coherent(struct device_node *np);

#else /* CONFIG_OF_ADDRESS */

static inline void __iomem *of_io_request_and_map(struct device_node *device,
@@ -104,12 +102,6 @@ static inline struct of_pci_range *of_pci_range_parser_one( 
	return NULL;

}



static inline int of_dma_get_range(struct device_node *np, u64 *dma_addr,

				u64 *paddr, u64 *size)

{

	return -ENODEV;

}



static inline bool of_dma_is_coherent(struct device_node *np)

{

	return false;