hv: remove the second argument of k[un]map_atomic() (86cbce4d) · Commits · e / devices / android_kernel_teracube_2e

drivers/staging/hv/storvsc_drv.c

+14 −17

Original line number	Original line	Diff line number	Diff line
	@@ -941,15 +941,14 @@ static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl,
	local_irq_save(flags);		local_irq_save(flags);

	for (i = 0; i < orig_sgl_count; i++) {		for (i = 0; i < orig_sgl_count; i++) {
	dest_addr = (unsigned long)kmap_atomic(sg_page((&orig_sgl[i])),		dest_addr = (unsigned long)kmap_atomic(sg_page((&orig_sgl[i])))
	KM_IRQ0) + orig_sgl[i].offset;		+ orig_sgl[i].offset;
	dest = dest_addr;		dest = dest_addr;
	destlen = orig_sgl[i].length;		destlen = orig_sgl[i].length;

	if (bounce_addr == 0)		if (bounce_addr == 0)
	bounce_addr =		bounce_addr =
	(unsigned long)kmap_atomic(sg_page((&bounce_sgl[j])),		(unsigned long)kmap_atomic(sg_page((&bounce_sgl[j])));
	KM_IRQ0);

	while (destlen) {		while (destlen) {
	src = bounce_addr + bounce_sgl[j].offset;		src = bounce_addr + bounce_sgl[j].offset;
	@@ -965,7 +964,7 @@ static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl,

	if (bounce_sgl[j].offset == bounce_sgl[j].length) {		if (bounce_sgl[j].offset == bounce_sgl[j].length) {
	/* full */		/* full */
	kunmap_atomic((void *)bounce_addr, KM_IRQ0);		kunmap_atomic((void *)bounce_addr);
	j++;		j++;

	/*		/*
	@@ -990,15 +989,14 @@ static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl,
	if (destlen \|\| i != orig_sgl_count - 1)		if (destlen \|\| i != orig_sgl_count - 1)
	bounce_addr =		bounce_addr =
	(unsigned long)kmap_atomic(		(unsigned long)kmap_atomic(
	sg_page((&bounce_sgl[j])), KM_IRQ0);		sg_page((&bounce_sgl[j])));
	} else if (destlen == 0 && i == orig_sgl_count - 1) {		} else if (destlen == 0 && i == orig_sgl_count - 1) {
	/* unmap the last bounce that is < PAGE_SIZE */		/* unmap the last bounce that is < PAGE_SIZE */
	kunmap_atomic((void *)bounce_addr, KM_IRQ0);		kunmap_atomic((void *)bounce_addr);
	}		}
	}		}

	kunmap_atomic((void *)(dest_addr - orig_sgl[i].offset),		kunmap_atomic((void *)(dest_addr - orig_sgl[i].offset));
	KM_IRQ0);
	}		}

	local_irq_restore(flags);		local_irq_restore(flags);
	@@ -1024,15 +1022,14 @@ static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl,
	local_irq_save(flags);		local_irq_save(flags);

	for (i = 0; i < orig_sgl_count; i++) {		for (i = 0; i < orig_sgl_count; i++) {
	src_addr = (unsigned long)kmap_atomic(sg_page((&orig_sgl[i])),		src_addr = (unsigned long)kmap_atomic(sg_page((&orig_sgl[i])))
	KM_IRQ0) + orig_sgl[i].offset;		+ orig_sgl[i].offset;
	src = src_addr;		src = src_addr;
	srclen = orig_sgl[i].length;		srclen = orig_sgl[i].length;

	if (bounce_addr == 0)		if (bounce_addr == 0)
	bounce_addr =		bounce_addr =
	(unsigned long)kmap_atomic(sg_page((&bounce_sgl[j])),		(unsigned long)kmap_atomic(sg_page((&bounce_sgl[j])));
	KM_IRQ0);

	while (srclen) {		while (srclen) {
	/* assume bounce offset always == 0 */		/* assume bounce offset always == 0 */
	@@ -1049,22 +1046,22 @@ static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl,

	if (bounce_sgl[j].length == PAGE_SIZE) {		if (bounce_sgl[j].length == PAGE_SIZE) {
	/* full..move to next entry */		/* full..move to next entry */
	kunmap_atomic((void *)bounce_addr, KM_IRQ0);		kunmap_atomic((void *)bounce_addr);
	j++;		j++;

	/* if we need to use another bounce buffer */		/* if we need to use another bounce buffer */
	if (srclen \|\| i != orig_sgl_count - 1)		if (srclen \|\| i != orig_sgl_count - 1)
	bounce_addr =		bounce_addr =
	(unsigned long)kmap_atomic(		(unsigned long)kmap_atomic(
	sg_page((&bounce_sgl[j])), KM_IRQ0);		sg_page((&bounce_sgl[j])));

	} else if (srclen == 0 && i == orig_sgl_count - 1) {		} else if (srclen == 0 && i == orig_sgl_count - 1) {
	/* unmap the last bounce that is < PAGE_SIZE */		/* unmap the last bounce that is < PAGE_SIZE */
	kunmap_atomic((void *)bounce_addr, KM_IRQ0);		kunmap_atomic((void *)bounce_addr);
	}		}
	}		}

	kunmap_atomic((void *)(src_addr - orig_sgl[i].offset), KM_IRQ0);		kunmap_atomic((void *)(src_addr - orig_sgl[i].offset));
	}		}

	local_irq_restore(flags);		local_irq_restore(flags);