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
d9a3255f
Commit
d9a3255f
authored
Jun 04, 2018
by
Vinod Koul
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/at' into for-linus
parents
019fca28
ede2b295
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
12 deletions
+6
-12
drivers/dma/at_hdmac.c
drivers/dma/at_hdmac.c
+3
-6
drivers/dma/at_xdmac.c
drivers/dma/at_xdmac.c
+3
-6
No files found.
drivers/dma/at_hdmac.c
View file @
d9a3255f
...
...
@@ -2041,8 +2041,7 @@ static void at_dma_shutdown(struct platform_device *pdev)
static
int
at_dma_prepare
(
struct
device
*
dev
)
{
struct
platform_device
*
pdev
=
to_platform_device
(
dev
);
struct
at_dma
*
atdma
=
platform_get_drvdata
(
pdev
);
struct
at_dma
*
atdma
=
dev_get_drvdata
(
dev
);
struct
dma_chan
*
chan
,
*
_chan
;
list_for_each_entry_safe
(
chan
,
_chan
,
&
atdma
->
dma_common
.
channels
,
...
...
@@ -2076,8 +2075,7 @@ static void atc_suspend_cyclic(struct at_dma_chan *atchan)
static
int
at_dma_suspend_noirq
(
struct
device
*
dev
)
{
struct
platform_device
*
pdev
=
to_platform_device
(
dev
);
struct
at_dma
*
atdma
=
platform_get_drvdata
(
pdev
);
struct
at_dma
*
atdma
=
dev_get_drvdata
(
dev
);
struct
dma_chan
*
chan
,
*
_chan
;
/* preserve data */
...
...
@@ -2118,8 +2116,7 @@ static void atc_resume_cyclic(struct at_dma_chan *atchan)
static
int
at_dma_resume_noirq
(
struct
device
*
dev
)
{
struct
platform_device
*
pdev
=
to_platform_device
(
dev
);
struct
at_dma
*
atdma
=
platform_get_drvdata
(
pdev
);
struct
at_dma
*
atdma
=
dev_get_drvdata
(
dev
);
struct
dma_chan
*
chan
,
*
_chan
;
/* bring back DMA controller */
...
...
drivers/dma/at_xdmac.c
View file @
d9a3255f
...
...
@@ -1833,8 +1833,7 @@ static void at_xdmac_free_chan_resources(struct dma_chan *chan)
#ifdef CONFIG_PM
static
int
atmel_xdmac_prepare
(
struct
device
*
dev
)
{
struct
platform_device
*
pdev
=
to_platform_device
(
dev
);
struct
at_xdmac
*
atxdmac
=
platform_get_drvdata
(
pdev
);
struct
at_xdmac
*
atxdmac
=
dev_get_drvdata
(
dev
);
struct
dma_chan
*
chan
,
*
_chan
;
list_for_each_entry_safe
(
chan
,
_chan
,
&
atxdmac
->
dma
.
channels
,
device_node
)
{
...
...
@@ -1853,8 +1852,7 @@ static int atmel_xdmac_prepare(struct device *dev)
#ifdef CONFIG_PM_SLEEP
static
int
atmel_xdmac_suspend
(
struct
device
*
dev
)
{
struct
platform_device
*
pdev
=
to_platform_device
(
dev
);
struct
at_xdmac
*
atxdmac
=
platform_get_drvdata
(
pdev
);
struct
at_xdmac
*
atxdmac
=
dev_get_drvdata
(
dev
);
struct
dma_chan
*
chan
,
*
_chan
;
list_for_each_entry_safe
(
chan
,
_chan
,
&
atxdmac
->
dma
.
channels
,
device_node
)
{
...
...
@@ -1878,8 +1876,7 @@ static int atmel_xdmac_suspend(struct device *dev)
static
int
atmel_xdmac_resume
(
struct
device
*
dev
)
{
struct
platform_device
*
pdev
=
to_platform_device
(
dev
);
struct
at_xdmac
*
atxdmac
=
platform_get_drvdata
(
pdev
);
struct
at_xdmac
*
atxdmac
=
dev_get_drvdata
(
dev
);
struct
at_xdmac_chan
*
atchan
;
struct
dma_chan
*
chan
,
*
_chan
;
int
i
;
...
...
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