Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
d7b4a756
Commit
d7b4a756
authored
Jan 04, 2006
by
Russell King
Committed by
Russell King
Jan 04, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ARM] Move DMA exports to be next to each function
Signed-off-by:
Russell King
<
rmk+kernel@arm.linux.org.uk
>
parent
95ba9fb0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
14 deletions
+12
-14
arch/arm/kernel/dma.c
arch/arm/kernel/dma.c
+12
-14
No files found.
arch/arm/kernel/dma.c
View file @
d7b4a756
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
#include <asm/mach/dma.h>
#include <asm/mach/dma.h>
DEFINE_SPINLOCK
(
dma_spin_lock
);
DEFINE_SPINLOCK
(
dma_spin_lock
);
EXPORT_SYMBOL
(
dma_spin_lock
);
static
dma_t
dma_chan
[
MAX_DMA_CHANNELS
];
static
dma_t
dma_chan
[
MAX_DMA_CHANNELS
];
...
@@ -77,6 +78,7 @@ int request_dma(dmach_t channel, const char *device_id)
...
@@ -77,6 +78,7 @@ int request_dma(dmach_t channel, const char *device_id)
busy:
busy:
return
-
EBUSY
;
return
-
EBUSY
;
}
}
EXPORT_SYMBOL
(
request_dma
);
/*
/*
* Free DMA channel
* Free DMA channel
...
@@ -108,6 +110,7 @@ void free_dma(dmach_t channel)
...
@@ -108,6 +110,7 @@ void free_dma(dmach_t channel)
bad_dma:
bad_dma:
printk
(
KERN_ERR
"dma: trying to free DMA%d
\n
"
,
channel
);
printk
(
KERN_ERR
"dma: trying to free DMA%d
\n
"
,
channel
);
}
}
EXPORT_SYMBOL
(
free_dma
);
/* Set DMA Scatter-Gather list
/* Set DMA Scatter-Gather list
*/
*/
...
@@ -123,6 +126,7 @@ void set_dma_sg (dmach_t channel, struct scatterlist *sg, int nr_sg)
...
@@ -123,6 +126,7 @@ void set_dma_sg (dmach_t channel, struct scatterlist *sg, int nr_sg)
dma
->
sgcount
=
nr_sg
;
dma
->
sgcount
=
nr_sg
;
dma
->
invalid
=
1
;
dma
->
invalid
=
1
;
}
}
EXPORT_SYMBOL
(
set_dma_sg
);
/* Set DMA address
/* Set DMA address
*
*
...
@@ -140,6 +144,7 @@ void __set_dma_addr (dmach_t channel, void *addr)
...
@@ -140,6 +144,7 @@ void __set_dma_addr (dmach_t channel, void *addr)
dma
->
addr
=
addr
;
dma
->
addr
=
addr
;
dma
->
invalid
=
1
;
dma
->
invalid
=
1
;
}
}
EXPORT_SYMBOL
(
__set_dma_addr
);
/* Set DMA byte count
/* Set DMA byte count
*
*
...
@@ -157,6 +162,7 @@ void set_dma_count (dmach_t channel, unsigned long count)
...
@@ -157,6 +162,7 @@ void set_dma_count (dmach_t channel, unsigned long count)
dma
->
count
=
count
;
dma
->
count
=
count
;
dma
->
invalid
=
1
;
dma
->
invalid
=
1
;
}
}
EXPORT_SYMBOL
(
set_dma_count
);
/* Set DMA direction mode
/* Set DMA direction mode
*/
*/
...
@@ -171,6 +177,7 @@ void set_dma_mode (dmach_t channel, dmamode_t mode)
...
@@ -171,6 +177,7 @@ void set_dma_mode (dmach_t channel, dmamode_t mode)
dma
->
dma_mode
=
mode
;
dma
->
dma_mode
=
mode
;
dma
->
invalid
=
1
;
dma
->
invalid
=
1
;
}
}
EXPORT_SYMBOL
(
set_dma_mode
);
/* Enable DMA channel
/* Enable DMA channel
*/
*/
...
@@ -191,6 +198,7 @@ void enable_dma (dmach_t channel)
...
@@ -191,6 +198,7 @@ void enable_dma (dmach_t channel)
printk
(
KERN_ERR
"dma%d: trying to enable free DMA
\n
"
,
channel
);
printk
(
KERN_ERR
"dma%d: trying to enable free DMA
\n
"
,
channel
);
BUG
();
BUG
();
}
}
EXPORT_SYMBOL
(
enable_dma
);
/* Disable DMA channel
/* Disable DMA channel
*/
*/
...
@@ -211,6 +219,7 @@ void disable_dma (dmach_t channel)
...
@@ -211,6 +219,7 @@ void disable_dma (dmach_t channel)
printk
(
KERN_ERR
"dma%d: trying to disable free DMA
\n
"
,
channel
);
printk
(
KERN_ERR
"dma%d: trying to disable free DMA
\n
"
,
channel
);
BUG
();
BUG
();
}
}
EXPORT_SYMBOL
(
disable_dma
);
/*
/*
* Is the specified DMA channel active?
* Is the specified DMA channel active?
...
@@ -224,6 +233,7 @@ void set_dma_page(dmach_t channel, char pagenr)
...
@@ -224,6 +233,7 @@ void set_dma_page(dmach_t channel, char pagenr)
{
{
printk
(
KERN_ERR
"dma%d: trying to set_dma_page
\n
"
,
channel
);
printk
(
KERN_ERR
"dma%d: trying to set_dma_page
\n
"
,
channel
);
}
}
EXPORT_SYMBOL
(
set_dma_page
);
void
set_dma_speed
(
dmach_t
channel
,
int
cycle_ns
)
void
set_dma_speed
(
dmach_t
channel
,
int
cycle_ns
)
{
{
...
@@ -234,6 +244,7 @@ void set_dma_speed(dmach_t channel, int cycle_ns)
...
@@ -234,6 +244,7 @@ void set_dma_speed(dmach_t channel, int cycle_ns)
ret
=
dma
->
d_ops
->
setspeed
(
channel
,
dma
,
cycle_ns
);
ret
=
dma
->
d_ops
->
setspeed
(
channel
,
dma
,
cycle_ns
);
dma
->
speed
=
ret
;
dma
->
speed
=
ret
;
}
}
EXPORT_SYMBOL
(
set_dma_speed
);
int
get_dma_residue
(
dmach_t
channel
)
int
get_dma_residue
(
dmach_t
channel
)
{
{
...
@@ -245,6 +256,7 @@ int get_dma_residue(dmach_t channel)
...
@@ -245,6 +256,7 @@ int get_dma_residue(dmach_t channel)
return
ret
;
return
ret
;
}
}
EXPORT_SYMBOL
(
get_dma_residue
);
static
int
__init
init_dma
(
void
)
static
int
__init
init_dma
(
void
)
{
{
...
@@ -253,17 +265,3 @@ static int __init init_dma(void)
...
@@ -253,17 +265,3 @@ static int __init init_dma(void)
}
}
core_initcall
(
init_dma
);
core_initcall
(
init_dma
);
EXPORT_SYMBOL
(
request_dma
);
EXPORT_SYMBOL
(
free_dma
);
EXPORT_SYMBOL
(
enable_dma
);
EXPORT_SYMBOL
(
disable_dma
);
EXPORT_SYMBOL
(
__set_dma_addr
);
EXPORT_SYMBOL
(
set_dma_count
);
EXPORT_SYMBOL
(
set_dma_mode
);
EXPORT_SYMBOL
(
set_dma_page
);
EXPORT_SYMBOL
(
get_dma_residue
);
EXPORT_SYMBOL
(
set_dma_sg
);
EXPORT_SYMBOL
(
set_dma_speed
);
EXPORT_SYMBOL
(
dma_spin_lock
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment