]>
Commit | Line | Data |
---|---|---|
08dc4bc5 GKH |
1 | From bd86b6c5c60711dbd4fa21bdb497a188ecb6cf63 Mon Sep 17 00:00:00 2001 |
2 | From: Mikulas Patocka <mpatocka@redhat.com> | |
3 | Date: Mon, 1 Apr 2019 17:46:56 +0200 | |
4 | Subject: udlfb: delete the unused parameter for dlfb_handle_damage | |
5 | ||
6 | From: Mikulas Patocka <mpatocka@redhat.com> | |
7 | ||
8 | commit bd86b6c5c60711dbd4fa21bdb497a188ecb6cf63 upstream. | |
9 | ||
10 | Remove the unused parameter "data" and unused variable "ret". | |
11 | ||
12 | Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> | |
13 | Cc: Bernie Thompson <bernie@plugable.com> | |
14 | Cc: Ladislav Michl <ladis@linux-mips.org> | |
15 | Cc: <stable@vger.kernel.org> | |
16 | Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | |
17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
18 | ||
19 | --- | |
20 | drivers/video/fbdev/udlfb.c | 21 +++++++++------------ | |
21 | 1 file changed, 9 insertions(+), 12 deletions(-) | |
22 | ||
23 | --- a/drivers/video/fbdev/udlfb.c | |
24 | +++ b/drivers/video/fbdev/udlfb.c | |
25 | @@ -594,10 +594,9 @@ static int dlfb_render_hline(struct dlfb | |
26 | return 0; | |
27 | } | |
28 | ||
29 | -static int dlfb_handle_damage(struct dlfb_data *dlfb, int x, int y, | |
30 | - int width, int height, char *data) | |
31 | +static int dlfb_handle_damage(struct dlfb_data *dlfb, int x, int y, int width, int height) | |
32 | { | |
33 | - int i, ret; | |
34 | + int i; | |
35 | char *cmd; | |
36 | cycles_t start_cycles, end_cycles; | |
37 | int bytes_sent = 0; | |
38 | @@ -641,7 +640,7 @@ static int dlfb_handle_damage(struct dlf | |
39 | *cmd++ = 0xAF; | |
40 | /* Send partial buffer remaining before exiting */ | |
41 | len = cmd - (char *) urb->transfer_buffer; | |
42 | - ret = dlfb_submit_urb(dlfb, urb, len); | |
43 | + dlfb_submit_urb(dlfb, urb, len); | |
44 | bytes_sent += len; | |
45 | } else | |
46 | dlfb_urb_completion(urb); | |
47 | @@ -679,7 +678,7 @@ static ssize_t dlfb_ops_write(struct fb_ | |
48 | (u32)info->var.yres); | |
49 | ||
50 | dlfb_handle_damage(dlfb, 0, start, info->var.xres, | |
51 | - lines, info->screen_base); | |
52 | + lines); | |
53 | } | |
54 | ||
55 | return result; | |
56 | @@ -695,7 +694,7 @@ static void dlfb_ops_copyarea(struct fb_ | |
57 | sys_copyarea(info, area); | |
58 | ||
59 | dlfb_handle_damage(dlfb, area->dx, area->dy, | |
60 | - area->width, area->height, info->screen_base); | |
61 | + area->width, area->height); | |
62 | } | |
63 | ||
64 | static void dlfb_ops_imageblit(struct fb_info *info, | |
65 | @@ -706,7 +705,7 @@ static void dlfb_ops_imageblit(struct fb | |
66 | sys_imageblit(info, image); | |
67 | ||
68 | dlfb_handle_damage(dlfb, image->dx, image->dy, | |
69 | - image->width, image->height, info->screen_base); | |
70 | + image->width, image->height); | |
71 | } | |
72 | ||
73 | static void dlfb_ops_fillrect(struct fb_info *info, | |
74 | @@ -717,7 +716,7 @@ static void dlfb_ops_fillrect(struct fb_ | |
75 | sys_fillrect(info, rect); | |
76 | ||
77 | dlfb_handle_damage(dlfb, rect->dx, rect->dy, rect->width, | |
78 | - rect->height, info->screen_base); | |
79 | + rect->height); | |
80 | } | |
81 | ||
82 | /* | |
83 | @@ -859,8 +858,7 @@ static int dlfb_ops_ioctl(struct fb_info | |
84 | if (area.y > info->var.yres) | |
85 | area.y = info->var.yres; | |
86 | ||
87 | - dlfb_handle_damage(dlfb, area.x, area.y, area.w, area.h, | |
88 | - info->screen_base); | |
89 | + dlfb_handle_damage(dlfb, area.x, area.y, area.w, area.h); | |
90 | } | |
91 | ||
92 | return 0; | |
93 | @@ -1065,8 +1063,7 @@ static int dlfb_ops_set_par(struct fb_in | |
94 | pix_framebuffer[i] = 0x37e6; | |
95 | } | |
96 | ||
97 | - dlfb_handle_damage(dlfb, 0, 0, info->var.xres, info->var.yres, | |
98 | - info->screen_base); | |
99 | + dlfb_handle_damage(dlfb, 0, 0, info->var.xres, info->var.yres); | |
100 | ||
101 | return 0; | |
102 | } |