Skip to content

Commit

Permalink
Staging: vme: Rename VME DMA functions
Browse files Browse the repository at this point in the history
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: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Martyn Welch authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent a4b0295 commit 58e5079
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/vme/TODO
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/vme/vme.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -704,7 +704,7 @@ struct vme_resource *vme_request_dma(struct device *dev)
err_bus:
return NULL;
}
EXPORT_SYMBOL(vme_request_dma);
EXPORT_SYMBOL(vme_dma_request);

/*
* Start new list
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/vme/vme.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/vme/vme_api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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'.
Expand Down

0 comments on commit 58e5079

Please sign in to comment.