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
3cfb2fac
Commit
3cfb2fac
authored
Aug 31, 2014
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nouveau: __iomem misannotations
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
e983094d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
drivers/gpu/drm/nouveau/nouveau_nvif.c
drivers/gpu/drm/nouveau/nouveau_nvif.c
+2
-2
drivers/gpu/drm/nouveau/nvif/driver.h
drivers/gpu/drm/nouveau/nvif/driver.h
+2
-2
drivers/gpu/drm/nouveau/nvif/object.h
drivers/gpu/drm/nouveau/nvif/object.h
+3
-3
No files found.
drivers/gpu/drm/nouveau/nouveau_nvif.c
View file @
3cfb2fac
...
@@ -40,12 +40,12 @@
...
@@ -40,12 +40,12 @@
#include "nouveau_usif.h"
#include "nouveau_usif.h"
static
void
static
void
nvkm_client_unmap
(
void
*
priv
,
void
*
ptr
,
u32
size
)
nvkm_client_unmap
(
void
*
priv
,
void
__iomem
*
ptr
,
u32
size
)
{
{
iounmap
(
ptr
);
iounmap
(
ptr
);
}
}
static
void
*
static
void
__iomem
*
nvkm_client_map
(
void
*
priv
,
u64
handle
,
u32
size
)
nvkm_client_map
(
void
*
priv
,
u64
handle
,
u32
size
)
{
{
return
ioremap
(
handle
,
size
);
return
ioremap
(
handle
,
size
);
...
...
drivers/gpu/drm/nouveau/nvif/driver.h
View file @
3cfb2fac
...
@@ -9,8 +9,8 @@ struct nvif_driver {
...
@@ -9,8 +9,8 @@ struct nvif_driver {
int
(
*
suspend
)(
void
*
priv
);
int
(
*
suspend
)(
void
*
priv
);
int
(
*
resume
)(
void
*
priv
);
int
(
*
resume
)(
void
*
priv
);
int
(
*
ioctl
)(
void
*
priv
,
bool
super
,
void
*
data
,
u32
size
,
void
**
hack
);
int
(
*
ioctl
)(
void
*
priv
,
bool
super
,
void
*
data
,
u32
size
,
void
**
hack
);
void
*
(
*
map
)(
void
*
priv
,
u64
handle
,
u32
size
);
void
__iomem
*
(
*
map
)(
void
*
priv
,
u64
handle
,
u32
size
);
void
(
*
unmap
)(
void
*
priv
,
void
*
ptr
,
u32
size
);
void
(
*
unmap
)(
void
*
priv
,
void
__iomem
*
ptr
,
u32
size
);
bool
keep
;
bool
keep
;
};
};
...
...
drivers/gpu/drm/nouveau/nvif/object.h
View file @
3cfb2fac
...
@@ -14,7 +14,7 @@ struct nvif_object {
...
@@ -14,7 +14,7 @@ struct nvif_object {
void
*
priv
;
/*XXX: hack */
void
*
priv
;
/*XXX: hack */
void
(
*
dtor
)(
struct
nvif_object
*
);
void
(
*
dtor
)(
struct
nvif_object
*
);
struct
{
struct
{
void
*
ptr
;
void
__iomem
*
ptr
;
u32
size
;
u32
size
;
}
map
;
}
map
;
};
};
...
@@ -42,7 +42,7 @@ void nvif_object_unmap(struct nvif_object *);
...
@@ -42,7 +42,7 @@ void nvif_object_unmap(struct nvif_object *);
struct nvif_object *_object = nvif_object(a); \
struct nvif_object *_object = nvif_object(a); \
u32 _data; \
u32 _data; \
if (likely(_object->map.ptr)) \
if (likely(_object->map.ptr)) \
_data = ioread##b##_native((u8 *)_object->map.ptr + (c)); \
_data = ioread##b##_native((u8
__iomem
*)_object->map.ptr + (c)); \
else \
else \
_data = nvif_object_rd(_object, (b) / 8, (c)); \
_data = nvif_object_rd(_object, (b) / 8, (c)); \
_data; \
_data; \
...
@@ -50,7 +50,7 @@ void nvif_object_unmap(struct nvif_object *);
...
@@ -50,7 +50,7 @@ void nvif_object_unmap(struct nvif_object *);
#define nvif_wr(a,b,c,d) ({ \
#define nvif_wr(a,b,c,d) ({ \
struct nvif_object *_object = nvif_object(a); \
struct nvif_object *_object = nvif_object(a); \
if (likely(_object->map.ptr)) \
if (likely(_object->map.ptr)) \
iowrite##b##_native((d), (u8 *)_object->map.ptr + (c)); \
iowrite##b##_native((d), (u8
__iomem
*)_object->map.ptr + (c)); \
else \
else \
nvif_object_wr(_object, (b) / 8, (c), (d)); \
nvif_object_wr(_object, (b) / 8, (c), (d)); \
})
})
...
...
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