Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cfb2fac authored by Al Viro's avatar Al Viro
Browse files

nouveau: __iomem misannotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e983094d

drivers/gpu/drm/nouveau/nouveau_nvif.c

+2 −2
Original line number Diff line number Diff line
@@ -40,12 +40,12 @@ 
#include "nouveau_usif.h"



static void

nvkm_client_unmap(void *priv, void *ptr, u32 size)

nvkm_client_unmap(void *priv, void __iomem *ptr, u32 size)

{

	iounmap(ptr);

}



static void *

static void __iomem *

nvkm_client_map(void *priv, u64 handle, u32 size)

{

	return ioremap(handle, size);

drivers/gpu/drm/nouveau/nvif/driver.h

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ struct nvif_driver { 
	int (*suspend)(void *priv);

	int (*resume)(void *priv);

	int (*ioctl)(void *priv, bool super, void *data, u32 size, void **hack);

	void *(*map)(void *priv, u64 handle, u32 size);

	void (*unmap)(void *priv, void *ptr, u32 size);

	void __iomem *(*map)(void *priv, u64 handle, u32 size);

	void (*unmap)(void *priv, void __iomem *ptr, u32 size);

	bool keep;

};

drivers/gpu/drm/nouveau/nvif/object.h

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ struct nvif_object { 
	void *priv; /*XXX: hack */

	void (*dtor)(struct nvif_object *);

	struct {

		void *ptr;

		void __iomem *ptr;

		u32 size;

	} map;

};
@@ -42,7 +42,7 @@ void nvif_object_unmap(struct nvif_object *); 
	struct nvif_object *_object = nvif_object(a);                          \

	u32 _data;                                                             \

	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                                                                   \

		_data = nvif_object_rd(_object, (b) / 8, (c));                 \

	_data;                                                                 \
@@ -50,7 +50,7 @@ void nvif_object_unmap(struct nvif_object *); 
#define nvif_wr(a,b,c,d) ({                                                    \

	struct nvif_object *_object = nvif_object(a);                          \

	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                                                                   \

		nvif_object_wr(_object, (b) / 8, (c), (d));                    \

})