Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

[firefly-linux-kernel-4.4.55.git] / drivers / staging / vt6656 / rc4.c

diff --git a/drivers/staging/vt6656/rc4.c b/drivers/staging/vt6656/rc4.c
index 5c3c2d0552b49f6ba51549b911208f966ea00c8d..2fd836f07536aba95ac198ce8d407d3db9b0e231 100644 (file)
--- a/drivers/staging/vt6656/rc4.c
+++ b/drivers/staging/vt6656/rc4.c
@@ -32,27 +32,27 @@
 
 #include "rc4.h"
 
-void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, unsigned int cbKey_len)
+void rc4_init(PRC4Ext pRC4, u8 * pbyKey, unsigned int cbKey_len)
 {
        unsigned int  ust1, ust2;
        unsigned int  keyindex;
        unsigned int  stateindex;
-       PBYTE pbyst;
+       u8 * pbyst;
        unsigned int  idx;
 
        pbyst = pRC4->abystate;
        pRC4->ux = 0;
        pRC4->uy = 0;
        for (idx = 0; idx < 256; idx++)
-               pbyst[idx] = (BYTE)idx;
+               pbyst[idx] = (u8)idx;
        keyindex = 0;
        stateindex = 0;
        for (idx = 0; idx < 256; idx++) {
                ust1 = pbyst[idx];
                stateindex = (stateindex + pbyKey[keyindex] + ust1) & 0xff;
                ust2 = pbyst[stateindex];
-               pbyst[stateindex] = (BYTE)ust1;
-               pbyst[idx] = (BYTE)ust2;
+               pbyst[stateindex] = (u8)ust1;
+               pbyst[idx] = (u8)ust2;
                if (++keyindex >= cbKey_len)
                        keyindex = 0;
        }
@@ -63,7 +63,7 @@ unsigned int rc4_byte(PRC4Ext pRC4)
        unsigned int ux;
        unsigned int uy;
        unsigned int ustx, usty;
-       PBYTE pbyst;
+       u8 * pbyst;
 
        pbyst = pRC4->abystate;
        ux = (pRC4->ux + 1) & 0xff;
@@ -72,16 +72,16 @@ unsigned int rc4_byte(PRC4Ext pRC4)
        usty = pbyst[uy];
        pRC4->ux = ux;
        pRC4->uy = uy;
-       pbyst[uy] = (BYTE)ustx;
-       pbyst[ux] = (BYTE)usty;
+       pbyst[uy] = (u8)ustx;
+       pbyst[ux] = (u8)usty;
 
        return pbyst[(ustx + usty) & 0xff];
 }
 
-void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest,
-                       PBYTE pbySrc, unsigned int cbData_len)
+void rc4_encrypt(PRC4Ext pRC4, u8 * pbyDest,
+                       u8 * pbySrc, unsigned int cbData_len)
 {
        unsigned int ii;
        for (ii = 0; ii < cbData_len; ii++)
-               pbyDest[ii] = (BYTE)(pbySrc[ii] ^ rc4_byte(pRC4));
+               pbyDest[ii] = (u8)(pbySrc[ii] ^ rc4_byte(pRC4));
 }