Staging: udlfb: checkpatch cleanup
Eliminate checkpatch.pl warnings and errors so later patches in series are clean Signed-off-by: Bernie Thompson <bernie@plugable.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
cd18964a1d
commit
1d31a9ee69
2 changed files with 34 additions and 41 deletions
|
@ -339,7 +339,7 @@ MODULE_DEVICE_TABLE(usb, id_table);
|
|||
|
||||
static struct usb_driver dlfb_driver;
|
||||
|
||||
// thanks to Henrik Bjerregaard Pedersen for this function
|
||||
/* thanks to Henrik Bjerregaard Pedersen for this function */
|
||||
static char *rle_compress16(uint16_t * src, char *dst, int rem)
|
||||
{
|
||||
|
||||
|
@ -347,7 +347,7 @@ static char *rle_compress16(uint16_t * src, char *dst, int rem)
|
|||
uint16_t pix0;
|
||||
char *end_if_raw = dst + 6 + 2 * rem;
|
||||
|
||||
dst += 6; // header will be filled in if RLE is worth it
|
||||
dst += 6; /* header will be filled in if RLE is worth it */
|
||||
|
||||
while (rem && dst < end_if_raw) {
|
||||
char *start = (char *)src;
|
||||
|
@ -366,8 +366,8 @@ static char *rle_compress16(uint16_t * src, char *dst, int rem)
|
|||
}
|
||||
|
||||
/*
|
||||
Thanks to Henrik Bjerregaard Pedersen for rle implementation and code refactoring.
|
||||
Next step is huffman compression.
|
||||
Thanks to Henrik Bjerregaard Pedersen for rle implementation
|
||||
and code refactoring. Next step is huffman compression.
|
||||
*/
|
||||
|
||||
static int
|
||||
|
@ -419,7 +419,7 @@ image_blit(struct dlfb_data *dev_info, int x, int y, int width, int height,
|
|||
bufptr - dev_info->buf);
|
||||
bufptr = dev_info->buf;
|
||||
}
|
||||
// number of pixels to consider this time
|
||||
/* number of pixels to consider this time */
|
||||
thistime = rem;
|
||||
if (thistime > 255)
|
||||
thistime = 255;
|
||||
|
@ -467,7 +467,7 @@ image_blit(struct dlfb_data *dev_info, int x, int y, int width, int height,
|
|||
bufptr = end_of_rle;
|
||||
|
||||
} else {
|
||||
// fallback to raw (or some other encoding?)
|
||||
/* fallback to raw (or other?) */
|
||||
*bufptr++ = 0xAF;
|
||||
*bufptr++ = 0x68;
|
||||
|
||||
|
@ -479,7 +479,6 @@ image_blit(struct dlfb_data *dev_info, int x, int y, int width, int height,
|
|||
*bufptr++ =
|
||||
(char)(base + firstdiff * 2);
|
||||
*bufptr++ = thistime - firstdiff;
|
||||
// PUT COMPRESSION HERE
|
||||
for (j = firstdiff * 2;
|
||||
j < thistime * 2; j += 2) {
|
||||
*bufptr++ = data[j + 1];
|
||||
|
@ -621,7 +620,7 @@ static void swapfb(struct dlfb_data *dev_info)
|
|||
|
||||
bufptr = dlfb_set_register(bufptr, 0xFF, 0x00);
|
||||
|
||||
// set addresses
|
||||
/* set addresses */
|
||||
bufptr =
|
||||
dlfb_set_register(bufptr, 0x20, (char)(dev_info->base16 >> 16));
|
||||
bufptr = dlfb_set_register(bufptr, 0x21, (char)(dev_info->base16 >> 8));
|
||||
|
@ -803,9 +802,6 @@ static void dlfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
|
|||
|
||||
copyarea(dev, area->dx, area->dy, area->sx, area->sy, area->width,
|
||||
area->height);
|
||||
|
||||
/* printk("COPY AREA %d %d %d %d %d %d !!!\n", area->dx, area->dy, area->sx, area->sy, area->width, area->height); */
|
||||
|
||||
}
|
||||
|
||||
static void dlfb_imageblit(struct fb_info *info, const struct fb_image *image)
|
||||
|
@ -813,12 +809,10 @@ static void dlfb_imageblit(struct fb_info *info, const struct fb_image *image)
|
|||
|
||||
int ret;
|
||||
struct dlfb_data *dev = info->par;
|
||||
/* printk("IMAGE BLIT (1) %d %d %d %d DEPTH %d {%p}!!!\n", image->dx, image->dy, image->width, image->height, image->depth, dev->udev); */
|
||||
cfb_imageblit(info, image);
|
||||
ret =
|
||||
image_blit(dev, image->dx, image->dy, image->width, image->height,
|
||||
info->screen_base);
|
||||
/* printk("IMAGE BLIT (2) %d %d %d %d DEPTH %d {%p} %d!!!\n", image->dx, image->dy, image->width, image->height, image->depth, dev->udev, ret); */
|
||||
}
|
||||
|
||||
static void dlfb_fillrect(struct fb_info *info,
|
||||
|
|
|
@ -44,7 +44,6 @@ static void dlfb_edid(struct dlfb_data *dev_info)
|
|||
usb_rcvctrlpipe(dev_info->udev, 0), (0x02),
|
||||
(0x80 | (0x02 << 5)), i << 8, 0xA1, rbuf, 2,
|
||||
0);
|
||||
/*printk("ret control msg edid %d: %d [%d]\n",i, ret, rbuf[1]); */
|
||||
dev_info->edid[i] = rbuf[1];
|
||||
}
|
||||
|
||||
|
|
Reference in a new issue