nouveau: __iomem misannotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Родитель
e983094d6d
Коммит
3cfb2face6
|
@ -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);
|
||||||
|
|
|
@ -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;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -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 *);
|
||||||
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 *);
|
||||||
#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)); \
|
||||||
})
|
})
|
||||||
|
|
Загрузка…
Ссылка в новой задаче