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

Commit bbaf3641 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[PATCH] drm: via: fix sparse warnings 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Dave Airlie <airlied@linux.ie>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent db1de159

drivers/char/drm/via_dma.c

+5 −5
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ int via_dma_init(DRM_IOCTL_ARGS) 
	drm_via_dma_init_t init;

	int retcode = 0;



	DRM_COPY_FROM_USER_IOCTL(init, (drm_via_dma_init_t *) data,

	DRM_COPY_FROM_USER_IOCTL(init, (drm_via_dma_init_t __user *) data,

				 sizeof(init));



	switch (init.func) {
@@ -343,7 +343,7 @@ int via_cmdbuffer(DRM_IOCTL_ARGS) 


	LOCK_TEST_WITH_RETURN( dev, filp );



	DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t *) data,

	DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t __user *) data,

				 sizeof(cmdbuf));



	DRM_DEBUG("via cmdbuffer, buf %p size %lu\n", cmdbuf.buf, cmdbuf.size);
@@ -386,7 +386,7 @@ int via_pci_cmdbuffer(DRM_IOCTL_ARGS) 


	LOCK_TEST_WITH_RETURN( dev, filp );



	DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t *) data,

	DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t __user *) data,

				 sizeof(cmdbuf));



	DRM_DEBUG("via_pci_cmdbuffer, buf %p size %lu\n", cmdbuf.buf,
@@ -701,7 +701,7 @@ via_cmdbuf_size(DRM_IOCTL_ARGS) 
		return DRM_ERR(EFAULT);

	}



	DRM_COPY_FROM_USER_IOCTL(d_siz, (drm_via_cmdbuf_size_t *) data,

	DRM_COPY_FROM_USER_IOCTL(d_siz, (drm_via_cmdbuf_size_t __user *) data,

				 sizeof(d_siz));
@@ -735,7 +735,7 @@ via_cmdbuf_size(DRM_IOCTL_ARGS) 
	}

	d_siz.size = tmp_size;



	DRM_COPY_TO_USER_IOCTL((drm_via_cmdbuf_size_t *) data, d_siz,

	DRM_COPY_TO_USER_IOCTL((drm_via_cmdbuf_size_t __user *) data, d_siz,

			       sizeof(d_siz));

	return ret;

}

drivers/char/drm/via_drm.h

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ typedef struct _drm_via_dma_init { 
} drm_via_dma_init_t;



typedef struct _drm_via_cmdbuffer {

	char *buf;

	char __user *buf;

	unsigned long size;

} drm_via_cmdbuffer_t;

drivers/char/drm/via_ds.c

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ memHeap_t *via_mmInit(int ofs, int size) 
	PMemBlock blocks;



	if (size <= 0)

		return 0;

		return NULL;



	blocks = (TMemBlock *) drm_calloc(1, sizeof(TMemBlock), DRM_MEM_DRIVER);
@@ -143,7 +143,7 @@ memHeap_t *via_mmInit(int ofs, int size) 
		blocks->free = 1;

		return (memHeap_t *) blocks;

	} else

		return 0;

		return NULL;

}



static TMemBlock *SliceBlock(TMemBlock * p,

drivers/char/drm/via_ds.h

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ struct mem_block_t { 
	struct mem_block_t *heap;

	int ofs, size;

	int align;

	int free:1;

	int reserved:1;

	unsigned int free:1;

	unsigned int reserved:1;

};

typedef struct mem_block_t TMemBlock;

typedef struct mem_block_t *PMemBlock;

drivers/char/drm/via_map.c

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ int via_map_init(DRM_IOCTL_ARGS) 


	DRM_DEBUG("%s\n", __FUNCTION__);



	DRM_COPY_FROM_USER_IOCTL(init, (drm_via_init_t *) data, sizeof(init));

	DRM_COPY_FROM_USER_IOCTL(init, (drm_via_init_t __user *) data,

				 sizeof(init));



	switch (init.func) {

	case VIA_INIT_MAP: