Hi tech@,

Return error values directly where appropriate, instead of using the err
variable.

While there, remove TODO about bitching. We haven't felt the need to bitch
since the driver was commited, and we do not bitch in aesni_setup() either.

Comments? OK?

Index: sys/arch/amd64/amd64/via.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/via.c,v
retrieving revision 1.29
diff -u -p -r1.29 via.c
--- sys/arch/amd64/amd64/via.c  28 Apr 2018 15:44:59 -0000      1.29
+++ sys/arch/amd64/amd64/via.c  29 May 2018 15:34:03 -0000
@@ -87,7 +87,7 @@ viac3_crypto_setup(void)
 
        vc3_sc = malloc(sizeof(*vc3_sc), M_DEVBUF, M_NOWAIT|M_ZERO);
        if (vc3_sc == NULL)
-               return;         /* YYY bitch? */
+               return;
 
        bzero(algs, sizeof(algs));
        algs[CRYPTO_AES_CBC] = CRYPTO_ALG_FLAG_SUPPORTED;
@@ -102,7 +102,7 @@ viac3_crypto_setup(void)
        vc3_sc->sc_cid = crypto_get_driverid(0);
        if (vc3_sc->sc_cid < 0) {
                free(vc3_sc, M_DEVBUF, sizeof(*vc3_sc));
-               return;         /* YYY bitch? */
+               return;
        }
 
        crypto_register(vc3_sc->sc_cid, algs, viac3_crypto_newsession,
@@ -340,16 +340,12 @@ viac3_crypto_encdec(struct cryptop *crp,
        u_int32_t *key;
        int     err = 0;
 
-       if ((crd->crd_len % 16) != 0) {
-               err = EINVAL;
-               return (err);
-       }
+       if ((crd->crd_len % 16) != 0)
+               return (EINVAL);
 
        sc->op_buf = malloc(crd->crd_len, M_DEVBUF, M_NOWAIT);
-       if (sc->op_buf == NULL) {
-               err = ENOMEM;
-               return (err);
-       }
+       if (sc->op_buf == NULL)
+               return (ENOMEM);
 
        if (crd->crd_flags & CRD_F_ENCRYPT) {
                sc->op_cw[0] = ses->ses_cw0 | C3_CRYPT_CWLO_ENCRYPT;
Index: sys/arch/i386/i386/via.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/via.c,v
retrieving revision 1.43
diff -u -p -r1.43 via.c
--- sys/arch/i386/i386/via.c    28 Apr 2018 15:44:59 -0000      1.43
+++ sys/arch/i386/i386/via.c    29 May 2018 15:34:03 -0000
@@ -88,7 +88,7 @@ viac3_crypto_setup(void)
 
        vc3_sc = malloc(sizeof(*vc3_sc), M_DEVBUF, M_NOWAIT|M_ZERO);
        if (vc3_sc == NULL)
-               return; /* YYY bitch? */
+               return;
 
        bzero(algs, sizeof(algs));
        algs[CRYPTO_AES_CBC] = CRYPTO_ALG_FLAG_SUPPORTED;
@@ -103,7 +103,7 @@ viac3_crypto_setup(void)
        vc3_sc->sc_cid = crypto_get_driverid(0);
        if (vc3_sc->sc_cid < 0) {
                free(vc3_sc, M_DEVBUF, sizeof(*vc3_sc));
-               return;         /* YYY bitch? */
+               return;
        }
 
        crypto_register(vc3_sc->sc_cid, algs, viac3_crypto_newsession,
@@ -341,16 +341,12 @@ viac3_crypto_encdec(struct cryptop *crp,
        u_int32_t *key;
        int     err = 0;
 
-       if ((crd->crd_len % 16) != 0) {
-               err = EINVAL;
-               return (err);
-       }
+       if ((crd->crd_len % 16) != 0)
+               return (EINVAL);
 
        sc->op_buf = malloc(crd->crd_len, M_DEVBUF, M_NOWAIT);
-       if (sc->op_buf == NULL) {
-               err = ENOMEM;
-               return (err);
-       }
+       if (sc->op_buf == NULL)
+               return (ENOMEM);
 
        if (crd->crd_flags & CRD_F_ENCRYPT) {
                sc->op_cw[0] = ses->ses_cw0 | C3_CRYPT_CWLO_ENCRYPT;

Reply via email to