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: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/vme/TODO b/drivers/staging/vme/TODO
index adc5fca42afd64b3c9ccd54d5e392e8c3e2f02b1..2201ff6f74d1ef4ae811eefc8965457725e1643e 100644 (file)
--- a/drivers/staging/vme/TODO
+++ b/drivers/staging/vme/TODO
@@ -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:
 

diff --git a/drivers/staging/vme/vme.c b/drivers/staging/vme/vme.c
index a6154f96b82626e8f941e0c06bdf606b8f5912ad..ca9e4de461498170c7008262475039e0d3175550 100644 (file)
--- a/drivers/staging/vme/vme.c
+++ b/drivers/staging/vme/vme.c
@@ -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

diff --git a/drivers/staging/vme/vme.h b/drivers/staging/vme/vme.h
index f999f6a83c722cd0033daf5189d629303fc78962..97dc22e34caf4fe06724e8ef3ccafdc81264986c 100644 (file)
--- a/drivers/staging/vme/vme.h
+++ b/drivers/staging/vme/vme.h
@@ -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);

diff --git a/drivers/staging/vme/vme_api.txt b/drivers/staging/vme/vme_api.txt
index 36b7a3c8421f4adfaaafd61f0e0c7704f46556ae..a5c1b1cd5fcc54c6fa72d091b3bc7a2ca60cdd39 100644 (file)
--- a/drivers/staging/vme/vme_api.txt
+++ b/drivers/staging/vme/vme_api.txt
@@ -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'.