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
Kirill Smelkov
linux
Commits
2856fcdc
Commit
2856fcdc
authored
Oct 15, 2014
by
Vinod Koul
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/dma_control_cleanup_acks' into for-linus
parents
639559ad
a500789d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
17 deletions
+11
-17
drivers/ata/pata_arasan_cf.c
drivers/ata/pata_arasan_cf.c
+2
-3
drivers/dma/coh901318.c
drivers/dma/coh901318.c
+1
-1
drivers/media/platform/soc_camera/mx3_camera.c
drivers/media/platform/soc_camera/mx3_camera.c
+2
-4
drivers/mtd/nand/fsmc_nand.c
drivers/mtd/nand/fsmc_nand.c
+1
-1
drivers/mtd/nand/sh_flctl.c
drivers/mtd/nand/sh_flctl.c
+1
-1
drivers/net/ethernet/micrel/ks8842.c
drivers/net/ethernet/micrel/ks8842.c
+2
-4
drivers/tty/serial/sh-sci.c
drivers/tty/serial/sh-sci.c
+1
-1
drivers/video/fbdev/mx3fb.c
drivers/video/fbdev/mx3fb.c
+1
-2
No files found.
drivers/ata/pata_arasan_cf.c
View file @
2856fcdc
...
...
@@ -420,7 +420,7 @@ dma_xfer(struct arasan_cf_dev *acdev, dma_addr_t src, dma_addr_t dest, u32 len)
/* Wait for DMA to complete */
if
(
!
wait_for_completion_timeout
(
&
acdev
->
dma_completion
,
TIMEOUT
))
{
chan
->
device
->
device_control
(
chan
,
DMA_TERMINATE_ALL
,
0
);
dmaengine_terminate_all
(
chan
);
dev_err
(
acdev
->
host
->
dev
,
"wait_for_completion_timeout
\n
"
);
return
-
ETIMEDOUT
;
}
...
...
@@ -928,8 +928,7 @@ static int arasan_cf_suspend(struct device *dev)
struct
arasan_cf_dev
*
acdev
=
host
->
ports
[
0
]
->
private_data
;
if
(
acdev
->
dma_chan
)
acdev
->
dma_chan
->
device
->
device_control
(
acdev
->
dma_chan
,
DMA_TERMINATE_ALL
,
0
);
dmaengine_terminate_all
(
acdev
->
dma_chan
);
cf_exit
(
acdev
);
return
ata_host_suspend
(
host
,
PMSG_SUSPEND
);
...
...
drivers/dma/coh901318.c
View file @
2856fcdc
...
...
@@ -2156,7 +2156,7 @@ coh901318_free_chan_resources(struct dma_chan *chan)
spin_unlock_irqrestore
(
&
cohc
->
lock
,
flags
);
chan
->
device
->
device_control
(
chan
,
DMA_TERMINATE_ALL
,
0
);
dmaengine_terminate_all
(
chan
);
}
...
...
drivers/media/platform/soc_camera/mx3_camera.c
View file @
2856fcdc
...
...
@@ -415,10 +415,8 @@ static void mx3_stop_streaming(struct vb2_queue *q)
struct
mx3_camera_buffer
*
buf
,
*
tmp
;
unsigned
long
flags
;
if
(
ichan
)
{
struct
dma_chan
*
chan
=
&
ichan
->
dma_chan
;
chan
->
device
->
device_control
(
chan
,
DMA_PAUSE
,
0
);
}
if
(
ichan
)
dmaengine_pause
(
&
ichan
->
dma_chan
);
spin_lock_irqsave
(
&
mx3_cam
->
lock
,
flags
);
...
...
drivers/mtd/nand/fsmc_nand.c
View file @
2856fcdc
...
...
@@ -605,7 +605,7 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
wait_for_completion_timeout
(
&
host
->
dma_access_complete
,
msecs_to_jiffies
(
3000
));
if
(
ret
<=
0
)
{
chan
->
device
->
device_control
(
chan
,
DMA_TERMINATE_ALL
,
0
);
dmaengine_terminate_all
(
chan
);
dev_err
(
host
->
dev
,
"wait_for_completion_timeout
\n
"
);
if
(
!
ret
)
ret
=
-
ETIMEDOUT
;
...
...
drivers/mtd/nand/sh_flctl.c
View file @
2856fcdc
...
...
@@ -395,7 +395,7 @@ static int flctl_dma_fifo0_transfer(struct sh_flctl *flctl, unsigned long *buf,
msecs_to_jiffies
(
3000
));
if
(
ret
<=
0
)
{
chan
->
device
->
device_control
(
chan
,
DMA_TERMINATE_ALL
,
0
);
dmaengine_terminate_all
(
chan
);
dev_err
(
&
flctl
->
pdev
->
dev
,
"wait_for_completion_timeout
\n
"
);
}
...
...
drivers/net/ethernet/micrel/ks8842.c
View file @
2856fcdc
...
...
@@ -875,13 +875,11 @@ static void ks8842_stop_dma(struct ks8842_adapter *adapter)
tx_ctl
->
adesc
=
NULL
;
if
(
tx_ctl
->
chan
)
tx_ctl
->
chan
->
device
->
device_control
(
tx_ctl
->
chan
,
DMA_TERMINATE_ALL
,
0
);
dmaengine_terminate_all
(
tx_ctl
->
chan
);
rx_ctl
->
adesc
=
NULL
;
if
(
rx_ctl
->
chan
)
rx_ctl
->
chan
->
device
->
device_control
(
rx_ctl
->
chan
,
DMA_TERMINATE_ALL
,
0
);
dmaengine_terminate_all
(
rx_ctl
->
chan
);
if
(
sg_dma_address
(
&
rx_ctl
->
sg
))
dma_unmap_single
(
adapter
->
dev
,
sg_dma_address
(
&
rx_ctl
->
sg
),
...
...
drivers/tty/serial/sh-sci.c
View file @
2856fcdc
...
...
@@ -1403,7 +1403,7 @@ static void work_fn_rx(struct work_struct *work)
unsigned
long
flags
;
int
count
;
chan
->
device
->
device_control
(
chan
,
DMA_TERMINATE_ALL
,
0
);
dmaengine_terminate_all
(
chan
);
dev_dbg
(
port
->
dev
,
"Read %zu bytes with cookie %d
\n
"
,
sh_desc
->
partial
,
sh_desc
->
cookie
);
...
...
drivers/video/fbdev/mx3fb.c
View file @
2856fcdc
...
...
@@ -461,8 +461,7 @@ static void sdc_disable_channel(struct mx3fb_info *mx3_fbi)
spin_unlock_irqrestore
(
&
mx3fb
->
lock
,
flags
);
mx3_fbi
->
txd
->
chan
->
device
->
device_control
(
mx3_fbi
->
txd
->
chan
,
DMA_TERMINATE_ALL
,
0
);
dmaengine_terminate_all
(
mx3_fbi
->
txd
->
chan
);
mx3_fbi
->
txd
=
NULL
;
mx3_fbi
->
cookie
=
-
EINVAL
;
}
...
...
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