From 48543be7393839a18fbfd8afdf4c5c90f75064d5 Mon Sep 17 00:00:00 2001 From: Martyn Welch Date: Thu, 29 Oct 2009 16:35:20 +0000 Subject: [PATCH] --- yaml --- r: 175223 b: refs/heads/master c: 58e507987b285f3df99f839c79da3985555ac220 h: refs/heads/master i: 175221: c275f0e46a581781b3091f7f4384dfb9f733ad6c 175219: 80266654c308003f80d12d580bc0ede8b5b89bec 175215: a339c9fca043b12ee5ca526fd9b972fe83f44b49 v: v3 --- [refs] | 2 +- trunk/drivers/staging/vme/TODO | 2 +- trunk/drivers/staging/vme/vme.c | 4 ++-- trunk/drivers/staging/vme/vme.h | 2 +- trunk/drivers/staging/vme/vme_api.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 489e4124e98f..d0bf68125e81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4b02959d5bec1b3e3a3e266b196673a89e62c29 +refs/heads/master: 58e507987b285f3df99f839c79da3985555ac220 diff --git a/trunk/drivers/staging/vme/TODO b/trunk/drivers/staging/vme/TODO index adc5fca42afd..2201ff6f74d1 100644 --- a/trunk/drivers/staging/vme/TODO +++ b/trunk/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/trunk/drivers/staging/vme/vme.c b/trunk/drivers/staging/vme/vme.c index a6154f96b826..ca9e4de46149 100644 --- a/trunk/drivers/staging/vme/vme.c +++ b/trunk/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 @@ 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 diff --git a/trunk/drivers/staging/vme/vme.h b/trunk/drivers/staging/vme/vme.h index f999f6a83c72..97dc22e34caf 100644 --- a/trunk/drivers/staging/vme/vme.h +++ b/trunk/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/trunk/drivers/staging/vme/vme_api.txt b/trunk/drivers/staging/vme/vme_api.txt index 36b7a3c8421f..a5c1b1cd5fcc 100644 --- a/trunk/drivers/staging/vme/vme_api.txt +++ b/trunk/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'.