Commit 90d53d19 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: fix __user annotations 



There are lots of troubles with atomisp __user annotations. Fix them.

drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.c:357:49: warning: incorrect type in argument 2 (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.c:357:49:    expected void *userptr
drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.c:357:49:    got void [noderef] <asn:1>*user_ptr
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:3302:43: warning: incorrect type in argument 2 (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:3302:43:    expected void const [noderef] <asn:1>*from
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:3302:43:    got void const *from
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:4070:58: warning: incorrect type in argument 2 (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:4070:58:    expected void const *from
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:4070:58:    got unsigned short [noderef] <asn:1>*<noident>
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:4082:58: warning: incorrect type in argument 2 (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:4082:58:    expected void const *from
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:4082:58:    got unsigned short [noderef] <asn:1>*<noident>
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:6179:62: warning: incorrect type in argument 2 (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:6179:62:    expected void const [noderef] <asn:1>*from
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c:6179:62:    got unsigned short [usertype] *<noident>

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 3204043f

drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.c

+4 −4
Original line number Diff line number Diff line
@@ -353,8 +353,8 @@ int atomisp_acc_map(struct atomisp_sub_device *asd, struct atomisp_acc_map *map) 
		}



		pgnr = DIV_ROUND_UP(map->length, PAGE_SIZE);

		cssptr = hrt_isp_css_mm_alloc_user_ptr(

				map->length, map->user_ptr,

		cssptr = hrt_isp_css_mm_alloc_user_ptr(map->length,

						       map->user_ptr,

						       pgnr, HRT_USR_PTR,

						       (map->flags & ATOMISP_MAP_FLAG_CACHED));

	} else {

drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c

+5 −4
Original line number Diff line number Diff line
@@ -3299,7 +3299,7 @@ static unsigned int long copy_from_compatible(void *to, const void *from, 
					      unsigned long n, bool from_user)

{

	if (from_user)

		return copy_from_user(to, from, n);

		return copy_from_user(to, (void __user *)from, n);

	else

		memcpy(to, from, n);

	return 0;
@@ -4067,7 +4067,7 @@ int atomisp_cp_morph_table(struct atomisp_sub_device *asd, 


	for (i = 0; i < CSS_MORPH_TABLE_NUM_PLANES; i++) {

		if (copy_from_compatible(morph_table->coordinates_x[i],

			source_morph_table->coordinates_x[i],

			(__force void *)source_morph_table->coordinates_x[i],

#ifndef ISP2401

			source_morph_table->height * source_morph_table->width *

			sizeof(*source_morph_table->coordinates_x[i]),
@@ -4079,7 +4079,7 @@ int atomisp_cp_morph_table(struct atomisp_sub_device *asd, 
			goto error;



		if (copy_from_compatible(morph_table->coordinates_y[i],

			source_morph_table->coordinates_y[i],

			(__force void *)source_morph_table->coordinates_y[i],

#ifndef ISP2401

			source_morph_table->height * source_morph_table->width *

			sizeof(*source_morph_table->coordinates_y[i]),
@@ -6176,7 +6176,8 @@ int atomisp_set_shading_table(struct atomisp_sub_device *asd, 
		    ATOMISP_SC_TYPE_SIZE;

	for (i = 0; i < ATOMISP_NUM_SC_COLORS; i++) {

		ret = copy_from_user(shading_table->data[i],

				     user_shading_table->data[i], len_table);

				     (void __user *)user_shading_table->data[i],

				     len_table);

		if (ret) {

			free_table = shading_table;

			ret = -EFAULT;

drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ void atomisp_css_frame_free(struct atomisp_css_frame *frame); 


int atomisp_css_frame_map(struct atomisp_css_frame **frame,

				const struct atomisp_css_frame_info *info,

				const void *data, uint16_t attribute,

				const void __user *data, uint16_t attribute,

				void *context);



int atomisp_css_set_black_frame(struct atomisp_sub_device *asd,

drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c

+1 −1
Original line number Diff line number Diff line
@@ -2189,7 +2189,7 @@ void atomisp_css_frame_free(struct atomisp_css_frame *frame) 


int atomisp_css_frame_map(struct atomisp_css_frame **frame,

				const struct atomisp_css_frame_info *info,

				const void *data, uint16_t attribute,

				const void __user *data, uint16_t attribute,

				void *context)

{

	if (ia_css_frame_map(frame, info, data, attribute, context)

drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1253,7 +1253,7 @@ static int atomisp_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf) 
		attributes.type = HRT_USR_PTR;

#endif

		ret = atomisp_css_frame_map(&handle, &frame_info,

				       (void *)buf->m.userptr,

				       (void __user *)buf->m.userptr,

				       0, &attributes);

		if (ret) {

			dev_err(isp->dev, "Failed to map user buffer\n");