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

Commit 58e50798 authored by Martyn Welch's avatar Martyn Welch Committed by Greg Kroah-Hartman
Browse files

Staging: vme: Rename VME DMA functions 



The DMA resource allocation function is called "vme_request_dma" while
master and slave window allocation functions are called
"vme_master_request" and "vme_slave_request" respectively. Rename
"vme_request_dma" to "vme_dma_request" to fit the pattern.

Signed-off-by: default avatarMartyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a4b02959

drivers/staging/vme/TODO

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ The current DMA resource Allocation provides no means of selecting the 
suitability of a DMA controller based on it's supported modes of operation, as

opposed to the resource allocation mechanisms for master and slave windows:



	struct vme_resource *vme_request_dma(struct device *dev);

	struct vme_resource *vme_dma_request(struct device *dev);



As opposed to:

drivers/staging/vme/vme.c

+2 −2
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ EXPORT_SYMBOL(vme_master_free); 
 * Request a DMA controller with specific attributes, return some unique

 * identifier.

 */

struct vme_resource *vme_request_dma(struct device *dev)

struct vme_resource *vme_dma_request(struct device *dev)

{

	struct vme_bridge *bridge;

	struct list_head *dma_pos = NULL;
@@ -704,7 +704,7 @@ err_ctrlr: 
err_bus:

	return NULL;

}

EXPORT_SYMBOL(vme_request_dma);

EXPORT_SYMBOL(vme_dma_request);



/*

 * Start new list

drivers/staging/vme/vme.h

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ unsigned int vme_master_rmw (struct vme_resource *, unsigned int, unsigned int, 
	unsigned int, loff_t);

void vme_master_free(struct vme_resource *);



struct vme_resource *vme_request_dma(struct device *);

struct vme_resource *vme_dma_request(struct device *);

struct vme_dma_list *vme_new_dma_list(struct vme_resource *);

struct vme_dma_attr *vme_dma_pattern_attribute(u32, vme_pattern_t);

struct vme_dma_attr *vme_dma_pci_attribute(dma_addr_t);

drivers/staging/vme/vme_api.txt

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ driver in question: 
	struct vme_resource * vme_slave_request(struct device *dev,

		vme_address_t aspace, vme_cycle_t cycle);



	struct vme_resource *vme_request_dma(struct device *dev);

	struct vme_resource *vme_dma_request(struct device *dev);



For slave windows these attributes are split into those of type 'vme_address_t'

and 'vme_cycle_t'. Master windows add a further set of attributes 'vme_cycle_t'.