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.
In addition, fix broken use of mutex_trylock().
Signed-off-by: Martyn Welch <martyn.welch@xxxxxxxxxxx>
---
drivers/staging/vme/TODO | 2 +-
drivers/staging/vme/vme.c | 10 +++++-----
drivers/staging/vme/vme.h | 2 +-
drivers/staging/vme/vme_api.txt | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/vme/TODO b/drivers/staging/vme/TODO
index adc5fca..2201ff6 100644
--- 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 c0153bf..381e57a 100644
--- 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
@@ -879,7 +879,7 @@ int vme_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src,
return -EINVAL;
}
- if (mutex_trylock(&(list->mtx))) {
+ if (!mutex_trylock(&(list->mtx))) {
printk("Link List already submitted\n");
return -EINVAL;
}
@@ -922,7 +922,7 @@ int vme_dma_list_free(struct vme_dma_list *list)
return -EINVAL;
}
- if (mutex_trylock(&(list->mtx))) {
+ if (!mutex_trylock(&(list->mtx))) {
printk("Link List in use\n");
return -EINVAL;
}
@@ -955,7 +955,7 @@ int vme_dma_free(struct vme_resource *resource)
ctrlr = list_entry(resource->entry, struct vme_dma_resource, list);
- if (mutex_trylock(&(ctrlr->mtx))) {
+ if (!mutex_trylock(&(ctrlr->mtx))) {
printk("Resource busy, can't free\n");
return -EBUSY;
}
diff --git a/drivers/staging/vme/vme.h b/drivers/staging/vme/vme.h
index f999f6a..97dc22e 100644
--- 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 36b7a3c..a5c1b1c 100644
--- 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'.
--
Martyn Welch MEng MPhil MIET (Principal Software Engineer) T:+44(0)1327322748
GE Fanuc Intelligent Platforms Ltd, |Registered in England and Wales
Tove Valley Business Park, Towcester, |(3828642) at 100 Barbirolli Square,
Northants, NN12 6PF, UK T:+44(0)1327359444 |Manchester,M2 3AB VAT:GB 927559189
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
