| Message ID | 20181022050042.GA12004@venus (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging: rtllib_crypt_ccmp: remove extra blank line | expand |
On Sun, Oct 21, 2018 at 11:00:42PM -0600, Zach Turner wrote: > This patch fixes 13 occurrences of the chekpatch.pl check: > > CHECK: Please don't use multiple blank lines > > Signed-off-by: Zach Turner <turnerzdp@gmail.com> Outreachy kernel patches need to be submitted to the outreachy mailing lists (and cc staging mailing list if you want). dri-devel here only takes gfx stuff, once you've landed a few patches in -staging. -Daniel > --- > drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c > index c8757965be55..8840a84e5dce 100644 > --- a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c > +++ b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c > @@ -94,7 +94,6 @@ static void rtllib_ccmp_deinit(void *priv) > kfree(priv); > } > > - > static inline void xor_block(u8 *b, u8 *a, size_t len) > { > int i; > @@ -103,8 +102,6 @@ static inline void xor_block(u8 *b, u8 *a, size_t len) > b[i] ^= a[i]; > } > > - > - > static void ccmp_init_blocks(struct crypto_tfm *tfm, > struct rtllib_hdr_4addr *hdr, > u8 *pn, size_t dlen, u8 *b0, u8 *auth, > @@ -180,8 +177,6 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm, > rtllib_ccmp_aes_encrypt(tfm, b0, s0); > } > > - > - > static int rtllib_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) > { > struct rtllib_ccmp_data *key = priv; > @@ -217,7 +212,6 @@ static int rtllib_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) > *pos++ = key->tx_pn[1]; > *pos++ = key->tx_pn[0]; > > - > hdr = (struct rtllib_hdr_4addr *) skb->data; > if (!tcb_desc->bHwSec) { > int blocks, last, len; > @@ -254,7 +248,6 @@ static int rtllib_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) > return 0; > } > > - > static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) > { > struct rtllib_ccmp_data *key = priv; > @@ -314,7 +307,6 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) > u8 *a = key->rx_a; > int i, blocks, last, len; > > - > ccmp_init_blocks(key->tfm, hdr, pn, data_len, b0, a, b); > xor_block(mic, b, CCMP_MIC_LEN); > > @@ -353,7 +345,6 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) > return keyidx; > } > > - > static int rtllib_ccmp_set_key(void *key, int len, u8 *seq, void *priv) > { > struct rtllib_ccmp_data *data = priv; > @@ -384,7 +375,6 @@ static int rtllib_ccmp_set_key(void *key, int len, u8 *seq, void *priv) > return 0; > } > > - > static int rtllib_ccmp_get_key(void *key, int len, u8 *seq, void *priv) > { > struct rtllib_ccmp_data *data = priv; > @@ -408,7 +398,6 @@ static int rtllib_ccmp_get_key(void *key, int len, u8 *seq, void *priv) > return CCMP_TK_LEN; > } > > - > static void rtllib_ccmp_print_stats(struct seq_file *m, void *priv) > { > struct rtllib_ccmp_data *ccmp = priv; > @@ -438,13 +427,11 @@ static struct lib80211_crypto_ops rtllib_crypt_ccmp = { > .owner = THIS_MODULE, > }; > > - > static int __init rtllib_crypto_ccmp_init(void) > { > return lib80211_register_crypto_ops(&rtllib_crypt_ccmp); > } > > - > static void __exit rtllib_crypto_ccmp_exit(void) > { > lib80211_unregister_crypto_ops(&rtllib_crypt_ccmp); > -- > 2.17.1 >
diff --git a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c index c8757965be55..8840a84e5dce 100644 --- a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c +++ b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c @@ -94,7 +94,6 @@ static void rtllib_ccmp_deinit(void *priv) kfree(priv); } - static inline void xor_block(u8 *b, u8 *a, size_t len) { int i; @@ -103,8 +102,6 @@ static inline void xor_block(u8 *b, u8 *a, size_t len) b[i] ^= a[i]; } - - static void ccmp_init_blocks(struct crypto_tfm *tfm, struct rtllib_hdr_4addr *hdr, u8 *pn, size_t dlen, u8 *b0, u8 *auth, @@ -180,8 +177,6 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm, rtllib_ccmp_aes_encrypt(tfm, b0, s0); } - - static int rtllib_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) { struct rtllib_ccmp_data *key = priv; @@ -217,7 +212,6 @@ static int rtllib_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) *pos++ = key->tx_pn[1]; *pos++ = key->tx_pn[0]; - hdr = (struct rtllib_hdr_4addr *) skb->data; if (!tcb_desc->bHwSec) { int blocks, last, len; @@ -254,7 +248,6 @@ static int rtllib_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) return 0; } - static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) { struct rtllib_ccmp_data *key = priv; @@ -314,7 +307,6 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) u8 *a = key->rx_a; int i, blocks, last, len; - ccmp_init_blocks(key->tfm, hdr, pn, data_len, b0, a, b); xor_block(mic, b, CCMP_MIC_LEN); @@ -353,7 +345,6 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) return keyidx; } - static int rtllib_ccmp_set_key(void *key, int len, u8 *seq, void *priv) { struct rtllib_ccmp_data *data = priv; @@ -384,7 +375,6 @@ static int rtllib_ccmp_set_key(void *key, int len, u8 *seq, void *priv) return 0; } - static int rtllib_ccmp_get_key(void *key, int len, u8 *seq, void *priv) { struct rtllib_ccmp_data *data = priv; @@ -408,7 +398,6 @@ static int rtllib_ccmp_get_key(void *key, int len, u8 *seq, void *priv) return CCMP_TK_LEN; } - static void rtllib_ccmp_print_stats(struct seq_file *m, void *priv) { struct rtllib_ccmp_data *ccmp = priv; @@ -438,13 +427,11 @@ static struct lib80211_crypto_ops rtllib_crypt_ccmp = { .owner = THIS_MODULE, }; - static int __init rtllib_crypto_ccmp_init(void) { return lib80211_register_crypto_ops(&rtllib_crypt_ccmp); } - static void __exit rtllib_crypto_ccmp_exit(void) { lib80211_unregister_crypto_ops(&rtllib_crypt_ccmp);
This patch fixes 13 occurrences of the chekpatch.pl check: CHECK: Please don't use multiple blank lines Signed-off-by: Zach Turner <turnerzdp@gmail.com> --- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 13 ------------- 1 file changed, 13 deletions(-)