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
8cc9c260
Commit
8cc9c260
authored
Jun 05, 2017
by
Christoph Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dma-mapping: remove the set_dma_mask method
Signed-off-by:
Christoph Hellwig
<
hch@lst.de
>
parent
7eb8a7a9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
10 deletions
+0
-10
arch/powerpc/kernel/dma.c
arch/powerpc/kernel/dma.c
+0
-4
include/linux/dma-mapping.h
include/linux/dma-mapping.h
+0
-6
No files found.
arch/powerpc/kernel/dma.c
View file @
8cc9c260
...
@@ -316,10 +316,6 @@ EXPORT_SYMBOL(dma_set_coherent_mask);
...
@@ -316,10 +316,6 @@ EXPORT_SYMBOL(dma_set_coherent_mask);
int
__dma_set_mask
(
struct
device
*
dev
,
u64
dma_mask
)
int
__dma_set_mask
(
struct
device
*
dev
,
u64
dma_mask
)
{
{
const
struct
dma_map_ops
*
dma_ops
=
get_dma_ops
(
dev
);
if
((
dma_ops
!=
NULL
)
&&
(
dma_ops
->
set_dma_mask
!=
NULL
))
return
dma_ops
->
set_dma_mask
(
dev
,
dma_mask
);
if
(
!
dev
->
dma_mask
||
!
dma_supported
(
dev
,
dma_mask
))
if
(
!
dev
->
dma_mask
||
!
dma_supported
(
dev
,
dma_mask
))
return
-
EIO
;
return
-
EIO
;
*
dev
->
dma_mask
=
dma_mask
;
*
dev
->
dma_mask
=
dma_mask
;
...
...
include/linux/dma-mapping.h
View file @
8cc9c260
...
@@ -127,7 +127,6 @@ struct dma_map_ops {
...
@@ -127,7 +127,6 @@ struct dma_map_ops {
enum
dma_data_direction
dir
);
enum
dma_data_direction
dir
);
int
(
*
mapping_error
)(
struct
device
*
dev
,
dma_addr_t
dma_addr
);
int
(
*
mapping_error
)(
struct
device
*
dev
,
dma_addr_t
dma_addr
);
int
(
*
dma_supported
)(
struct
device
*
dev
,
u64
mask
);
int
(
*
dma_supported
)(
struct
device
*
dev
,
u64
mask
);
int
(
*
set_dma_mask
)(
struct
device
*
dev
,
u64
mask
);
#ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK
#ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK
u64
(
*
get_required_mask
)(
struct
device
*
dev
);
u64
(
*
get_required_mask
)(
struct
device
*
dev
);
#endif
#endif
...
@@ -563,11 +562,6 @@ static inline int dma_supported(struct device *dev, u64 mask)
...
@@ -563,11 +562,6 @@ static inline int dma_supported(struct device *dev, u64 mask)
#ifndef HAVE_ARCH_DMA_SET_MASK
#ifndef HAVE_ARCH_DMA_SET_MASK
static
inline
int
dma_set_mask
(
struct
device
*
dev
,
u64
mask
)
static
inline
int
dma_set_mask
(
struct
device
*
dev
,
u64
mask
)
{
{
const
struct
dma_map_ops
*
ops
=
get_dma_ops
(
dev
);
if
(
ops
->
set_dma_mask
)
return
ops
->
set_dma_mask
(
dev
,
mask
);
if
(
!
dev
->
dma_mask
||
!
dma_supported
(
dev
,
mask
))
if
(
!
dev
->
dma_mask
||
!
dma_supported
(
dev
,
mask
))
return
-
EIO
;
return
-
EIO
;
*
dev
->
dma_mask
=
mask
;
*
dev
->
dma_mask
=
mask
;
...
...
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