break;
        case CTL_FLAG_GEN_REVAES:
                ctx = crypto_tfm_ctx(crypt->data.tfm);
-               *(u32 *)ctx->decrypt.npe_ctx &= cpu_to_be32(~CIPH_ENCR);
+               *(__be32 *)ctx->decrypt.npe_ctx &= cpu_to_be32(~CIPH_ENCR);
                if (atomic_dec_and_test(&ctx->configuring))
                        complete(&ctx->completion);
                break;
        crypt->init_len = init_len;
        crypt->ctl_flags |= CTL_FLAG_GEN_ICV;
 
-       buf->next = 0;
+       buf->next = NULL;
        buf->buf_len = HMAC_PAD_BLOCKLEN;
        buf->pkt_len = 0;
        buf->phys_addr = pad_phys;
 #ifndef __ARMEB__
        cfgword ^= 0xAA000000; /* change the "byte swap" flags */
 #endif
-       *(u32 *)cinfo = cpu_to_be32(cfgword);
+       *(__be32 *)cinfo = cpu_to_be32(cfgword);
        cinfo += sizeof(cfgword);
 
        /* write ICV to cryptinfo */
        if (!crypt)
                return -EAGAIN;
 
-       *(u32 *)dir->npe_ctx |= cpu_to_be32(CIPH_ENCR);
+       *(__be32 *)dir->npe_ctx |= cpu_to_be32(CIPH_ENCR);
 
        crypt->data.tfm = tfm;
        crypt->crypt_offs = 0;
                        return err;
        }
        /* write cfg word to cryptinfo */
-       *(u32 *)cinfo = cpu_to_be32(cipher_cfg);
+       *(__be32 *)cinfo = cpu_to_be32(cipher_cfg);
        cinfo += sizeof(cipher_cfg);
 
        /* write cipher key to cryptinfo */