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

Commit 1b8c9556 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Greg Kroah-Hartman
Browse files

udlfb: delete the unused parameter for dlfb_handle_damage 



commit bd86b6c5c60711dbd4fa21bdb497a188ecb6cf63 upstream.

Remove the unused parameter "data" and unused variable "ret".

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Cc: Bernie Thompson <bernie@plugable.com>
Cc: Ladislav Michl <ladis@linux-mips.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3487804c

drivers/video/fbdev/udlfb.c

+9 −12
Original line number Diff line number Diff line
@@ -594,10 +594,9 @@ static int dlfb_render_hline(struct dlfb_data *dlfb, struct urb **urb_ptr, 
	return 0;

}



static int dlfb_handle_damage(struct dlfb_data *dlfb, int x, int y,

	       int width, int height, char *data)

static int dlfb_handle_damage(struct dlfb_data *dlfb, int x, int y, int width, int height)

{

	int i, ret;

	int i;

	char *cmd;

	cycles_t start_cycles, end_cycles;

	int bytes_sent = 0;
@@ -641,7 +640,7 @@ static int dlfb_handle_damage(struct dlfb_data *dlfb, int x, int y, 
			*cmd++ = 0xAF;

		/* Send partial buffer remaining before exiting */

		len = cmd - (char *) urb->transfer_buffer;

		ret = dlfb_submit_urb(dlfb, urb, len);

		dlfb_submit_urb(dlfb, urb, len);

		bytes_sent += len;

	} else

		dlfb_urb_completion(urb);
@@ -679,7 +678,7 @@ static ssize_t dlfb_ops_write(struct fb_info *info, const char __user *buf, 
				(u32)info->var.yres);



		dlfb_handle_damage(dlfb, 0, start, info->var.xres,

			lines, info->screen_base);

			lines);

	}



	return result;
@@ -695,7 +694,7 @@ static void dlfb_ops_copyarea(struct fb_info *info, 
	sys_copyarea(info, area);



	dlfb_handle_damage(dlfb, area->dx, area->dy,

			area->width, area->height, info->screen_base);

			area->width, area->height);

}



static void dlfb_ops_imageblit(struct fb_info *info,
@@ -706,7 +705,7 @@ static void dlfb_ops_imageblit(struct fb_info *info, 
	sys_imageblit(info, image);



	dlfb_handle_damage(dlfb, image->dx, image->dy,

			image->width, image->height, info->screen_base);

			image->width, image->height);

}



static void dlfb_ops_fillrect(struct fb_info *info,
@@ -717,7 +716,7 @@ static void dlfb_ops_fillrect(struct fb_info *info, 
	sys_fillrect(info, rect);



	dlfb_handle_damage(dlfb, rect->dx, rect->dy, rect->width,

			      rect->height, info->screen_base);

			      rect->height);

}



/*
@@ -859,8 +858,7 @@ static int dlfb_ops_ioctl(struct fb_info *info, unsigned int cmd, 
		if (area.y > info->var.yres)

			area.y = info->var.yres;



		dlfb_handle_damage(dlfb, area.x, area.y, area.w, area.h,

			   info->screen_base);

		dlfb_handle_damage(dlfb, area.x, area.y, area.w, area.h);

	}



	return 0;
@@ -1065,8 +1063,7 @@ static int dlfb_ops_set_par(struct fb_info *info) 
			pix_framebuffer[i] = 0x37e6;

	}



	dlfb_handle_damage(dlfb, 0, 0, info->var.xres, info->var.yres,

			   info->screen_base);

	dlfb_handle_damage(dlfb, 0, 0, info->var.xres, info->var.yres);



	return 0;

}