sisusb: remove dummy variables

[mirror_ubuntu-artful-kernel.git] / drivers / usb / misc / sisusbvga / sisusb.c

diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 15666ad7c772fe5a9b960e8e37f5bf93a150bcd1..02abfcdfbf7bc887b4b331a5da9066d5db8c152a 100644 (file)
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -1285,18 +1285,22 @@ int sisusb_readb(struct sisusb_usb_data *sisusb, u32 adr, u8 *data)
 }
 
 int sisusb_copy_memory(struct sisusb_usb_data *sisusb, char *src,
-               u32 dest, int length, size_t *bytes_written)
+               u32 dest, int length)
 {
+       size_t dummy;
+
        return sisusb_write_mem_bulk(sisusb, dest, src, length,
-                       NULL, 0, bytes_written);
+                       NULL, 0, &dummy);
 }
 
 #ifdef SISUSBENDIANTEST
-int sisusb_read_memory(struct sisusb_usb_data *sisusb, char *dest,
-               u32 src, int length, size_t *bytes_written)
+static int sisusb_read_memory(struct sisusb_usb_data *sisusb, char *dest,
+               u32 src, int length)
 {
+       size_t dummy;
+
        return sisusb_read_mem_bulk(sisusb, src, dest, length,
-                       NULL, bytes_written);
+                       NULL, &dummy);
 }
 #endif
 #endif
@@ -1306,16 +1310,14 @@ static void sisusb_testreadwrite(struct sisusb_usb_data *sisusb)
 {
        static char srcbuffer[] = { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 };
        char destbuffer[10];
-       size_t dummy;
        int i, j;
 
-       sisusb_copy_memory(sisusb, srcbuffer, sisusb->vrambase, 7, &dummy);
+       sisusb_copy_memory(sisusb, srcbuffer, sisusb->vrambase, 7);
 
        for (i = 1; i <= 7; i++) {
                dev_dbg(&sisusb->sisusb_dev->dev,
                                "sisusb: rwtest %d bytes\n", i);
-               sisusb_read_memory(sisusb, destbuffer, sisusb->vrambase,
-                               i, &dummy);
+               sisusb_read_memory(sisusb, destbuffer, sisusb->vrambase, i);
                for (j = 0; j < i; j++) {
                        dev_dbg(&sisusb->sisusb_dev->dev,
                                        "rwtest read[%d] = %x\n",
@@ -2276,7 +2278,6 @@ int sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init)
        const struct font_desc *myfont;
        u8 *tempbuf;
        u16 *tempbufb;
-       size_t written;
        static const char bootstring[] =
                "SiSUSB VGA text console, (C) 2005 Thomas Winischhofer.";
        static const char bootlogo[] = "(o_ //\\ V_/_";
@@ -2343,18 +2344,15 @@ int sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init)
                                *(tempbufb++) = 0x0700 | bootstring[i++];
 
                        ret |= sisusb_copy_memory(sisusb, tempbuf,
-                                       sisusb->vrambase, 8192, &written);
+                                       sisusb->vrambase, 8192);
 
                        vfree(tempbuf);
 
                }
 
        } else if (sisusb->scrbuf) {
-
                ret |= sisusb_copy_memory(sisusb, (char *)sisusb->scrbuf,
-                               sisusb->vrambase, sisusb->scrbuf_size,
-                               &written);
-
+                               sisusb->vrambase, sisusb->scrbuf_size);
        }
 
        if (sisusb->sisusb_cursor_size_from >= 0 &&