2023-03-23 19:22:18

by Khadija Kamran

[permalink] [raw]
Subject: [PATCH v2 1/4] staging: rtl8192e: remove extra blank lines

Remove extra blank lines as reported by checkpatch.pl

"CHECK: Please don't use multiple blank lines"

Signed-off-by: Khadija Kamran <[email protected]>
---
drivers/staging/rtl8192e/rtllib_rx.c | 13 -------------
1 file changed, 13 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index c394c21beefb..c6114d99829b 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -154,7 +154,6 @@ rtllib_frag_cache_get(struct rtllib_device *ieee,
return skb;
}

-
/* Called only as a tasklet (software IRQ) */
static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee,
struct rtllib_hdr_4addr *hdr)
@@ -318,7 +317,6 @@ rtllib_rx_frame_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
return res;
}

-
/* Called only as a tasklet (software IRQ), by rtllib_rx */
static inline int
rtllib_rx_frame_decrypt_msdu(struct rtllib_device *ieee, struct sk_buff *skb,
@@ -355,7 +353,6 @@ rtllib_rx_frame_decrypt_msdu(struct rtllib_device *ieee, struct sk_buff *skb,
return 0;
}

-
/* this function is stolen from ipw2200 driver*/
#define IEEE_PACKET_RETRY_TIME (5*HZ)
static int is_duplicate_packet(struct rtllib_device *ieee,
@@ -887,7 +884,6 @@ static u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb,
return rxb->nr_subframes;
}

-
static size_t rtllib_rx_get_hdrlen(struct rtllib_device *ieee,
struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats)
@@ -1569,7 +1565,6 @@ static int rtllib_verify_qos_info(struct rtllib_qos_information_element
return 0;
}

-
/* Parse a QoS parameter element */
static int rtllib_read_qos_param_element(
struct rtllib_qos_parameter_info *element_param,
@@ -1599,7 +1594,6 @@ static int rtllib_read_qos_info_element(
return rtllib_verify_qos_info(element_info, QOS_OUI_INFO_SUB_TYPE);
}

-
/* Write QoS parameters from the ac parameters. */
static int rtllib_qos_convert_ac_to_parameters(struct rtllib_qos_parameter_info *param_elm,
struct rtllib_qos_data *qos_data)
@@ -1843,7 +1837,6 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
}
}

-
if (*tmp_htinfo_len == 0) {
if (info_element->len >= 4 &&
info_element->data[0] == 0x00 &&
@@ -1932,7 +1925,6 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
info_element->data[2] == 0x96)
network->cisco_cap_exist = true;

-
if (info_element->len >= 3 &&
info_element->data[0] == 0x00 &&
info_element->data[1] == 0x0a &&
@@ -2142,13 +2134,11 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,

network->dtim_data = RTLLIB_DTIM_VALID;

-
if (info_element->data[2] & 1)
network->dtim_data |= RTLLIB_DTIM_MBCAST;

offset = (info_element->data[2] >> 1)*2;

-
if (ieee->assoc_id < 8*offset ||
ieee->assoc_id > 8*(offset + info_element->len - 3))
break;
@@ -2203,7 +2193,6 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
&tmp_htcap_len);
break;

-
case MFIE_TYPE_HT_INFO:
netdev_dbg(ieee->dev, "MFIE_TYPE_HT_INFO: %d bytes\n",
info_element->len);
@@ -2392,7 +2381,6 @@ static inline int is_same_network(struct rtllib_network *src,
(dst->capability & WLAN_CAPABILITY_ESS)));
}

-
static inline void update_network(struct rtllib_device *ieee,
struct rtllib_network *dst,
struct rtllib_network *src)
@@ -2580,7 +2568,6 @@ static inline void rtllib_process_probe_response(
goto free_network;
}

-
if (!rtllib_legal_channel(ieee, network->channel))
goto free_network;

--
2.34.1


2023-03-24 15:44:27

by Alison Schofield

[permalink] [raw]
Subject: Re: [PATCH v2 1/4] staging: rtl8192e: remove extra blank lines

On Fri, Mar 24, 2023 at 12:19:59AM +0500, Khadija Kamran wrote:
> Remove extra blank lines as reported by checkpatch.pl
>
> "CHECK: Please don't use multiple blank lines"

Commit log needs to say why you did it, why this patch need to be
merged. Checkpatch itself doesn't satisfy the why requirement.

When we do these white space cleanups, the why is typically
"to adhere to the Linux kernel coding-style."

If you are doing a particular checkpatch cleanup and are not
sure what to write, check your predecessors.

$ git log --oneline | grep "multiple blank lines"

That'll give you many instances. Reference a few, some poor ones
sneak through.

Alison

>
> Signed-off-by: Khadija Kamran <[email protected]>
> ---
> drivers/staging/rtl8192e/rtllib_rx.c | 13 -------------
> 1 file changed, 13 deletions(-)
>
> diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
> index c394c21beefb..c6114d99829b 100644
> --- a/drivers/staging/rtl8192e/rtllib_rx.c
> +++ b/drivers/staging/rtl8192e/rtllib_rx.c
> @@ -154,7 +154,6 @@ rtllib_frag_cache_get(struct rtllib_device *ieee,
> return skb;
> }
>
> -
> /* Called only as a tasklet (software IRQ) */
> static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee,
> struct rtllib_hdr_4addr *hdr)
> @@ -318,7 +317,6 @@ rtllib_rx_frame_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
> return res;
> }
>
> -
> /* Called only as a tasklet (software IRQ), by rtllib_rx */
> static inline int
> rtllib_rx_frame_decrypt_msdu(struct rtllib_device *ieee, struct sk_buff *skb,
> @@ -355,7 +353,6 @@ rtllib_rx_frame_decrypt_msdu(struct rtllib_device *ieee, struct sk_buff *skb,
> return 0;
> }
>
> -
> /* this function is stolen from ipw2200 driver*/
> #define IEEE_PACKET_RETRY_TIME (5*HZ)
> static int is_duplicate_packet(struct rtllib_device *ieee,
> @@ -887,7 +884,6 @@ static u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb,
> return rxb->nr_subframes;
> }
>
> -
> static size_t rtllib_rx_get_hdrlen(struct rtllib_device *ieee,
> struct sk_buff *skb,
> struct rtllib_rx_stats *rx_stats)
> @@ -1569,7 +1565,6 @@ static int rtllib_verify_qos_info(struct rtllib_qos_information_element
> return 0;
> }
>
> -
> /* Parse a QoS parameter element */
> static int rtllib_read_qos_param_element(
> struct rtllib_qos_parameter_info *element_param,
> @@ -1599,7 +1594,6 @@ static int rtllib_read_qos_info_element(
> return rtllib_verify_qos_info(element_info, QOS_OUI_INFO_SUB_TYPE);
> }
>
> -
> /* Write QoS parameters from the ac parameters. */
> static int rtllib_qos_convert_ac_to_parameters(struct rtllib_qos_parameter_info *param_elm,
> struct rtllib_qos_data *qos_data)
> @@ -1843,7 +1837,6 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
> }
> }
>
> -
> if (*tmp_htinfo_len == 0) {
> if (info_element->len >= 4 &&
> info_element->data[0] == 0x00 &&
> @@ -1932,7 +1925,6 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
> info_element->data[2] == 0x96)
> network->cisco_cap_exist = true;
>
> -
> if (info_element->len >= 3 &&
> info_element->data[0] == 0x00 &&
> info_element->data[1] == 0x0a &&
> @@ -2142,13 +2134,11 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
>
> network->dtim_data = RTLLIB_DTIM_VALID;
>
> -
> if (info_element->data[2] & 1)
> network->dtim_data |= RTLLIB_DTIM_MBCAST;
>
> offset = (info_element->data[2] >> 1)*2;
>
> -
> if (ieee->assoc_id < 8*offset ||
> ieee->assoc_id > 8*(offset + info_element->len - 3))
> break;
> @@ -2203,7 +2193,6 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
> &tmp_htcap_len);
> break;
>
> -
> case MFIE_TYPE_HT_INFO:
> netdev_dbg(ieee->dev, "MFIE_TYPE_HT_INFO: %d bytes\n",
> info_element->len);
> @@ -2392,7 +2381,6 @@ static inline int is_same_network(struct rtllib_network *src,
> (dst->capability & WLAN_CAPABILITY_ESS)));
> }
>
> -
> static inline void update_network(struct rtllib_device *ieee,
> struct rtllib_network *dst,
> struct rtllib_network *src)
> @@ -2580,7 +2568,6 @@ static inline void rtllib_process_probe_response(
> goto free_network;
> }
>
> -
> if (!rtllib_legal_channel(ieee, network->channel))
> goto free_network;
>
> --
> 2.34.1
>
>

2023-03-24 22:14:30

by Khadija Kamran

[permalink] [raw]
Subject: Re: [PATCH v2 1/4] staging: rtl8192e: remove extra blank lines

On Fri, Mar 24, 2023 at 08:41:11AM -0700, Alison Schofield wrote:
> On Fri, Mar 24, 2023 at 12:19:59AM +0500, Khadija Kamran wrote:
> > Remove extra blank lines as reported by checkpatch.pl
> >
> > "CHECK: Please don't use multiple blank lines"
>
> Commit log needs to say why you did it, why this patch need to be
> merged. Checkpatch itself doesn't satisfy the why requirement.
>
> When we do these white space cleanups, the why is typically
> "to adhere to the Linux kernel coding-style."
>
> If you are doing a particular checkpatch cleanup and are not
> sure what to write, check your predecessors.
>
> $ git log --oneline | grep "multiple blank lines"
>

Hey Alison,

I have resent the patchset with the advised changes.
Thank you!

Regards,
Khadija

> That'll give you many instances. Reference a few, some poor ones
> sneak through.
>
> Alison
>
> >
> > Signed-off-by: Khadija Kamran <[email protected]>
> > ---
> > drivers/staging/rtl8192e/rtllib_rx.c | 13 -------------
> > 1 file changed, 13 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
> > index c394c21beefb..c6114d99829b 100644
> > --- a/drivers/staging/rtl8192e/rtllib_rx.c
> > +++ b/drivers/staging/rtl8192e/rtllib_rx.c
> > @@ -154,7 +154,6 @@ rtllib_frag_cache_get(struct rtllib_device *ieee,
> > return skb;
> > }
> >
> > -
> > /* Called only as a tasklet (software IRQ) */
> > static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee,
> > struct rtllib_hdr_4addr *hdr)
> > @@ -318,7 +317,6 @@ rtllib_rx_frame_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
> > return res;
> > }
> >
> > -
> > /* Called only as a tasklet (software IRQ), by rtllib_rx */
> > static inline int
> > rtllib_rx_frame_decrypt_msdu(struct rtllib_device *ieee, struct sk_buff *skb,
> > @@ -355,7 +353,6 @@ rtllib_rx_frame_decrypt_msdu(struct rtllib_device *ieee, struct sk_buff *skb,
> > return 0;
> > }
> >
> > -
> > /* this function is stolen from ipw2200 driver*/
> > #define IEEE_PACKET_RETRY_TIME (5*HZ)
> > static int is_duplicate_packet(struct rtllib_device *ieee,
> > @@ -887,7 +884,6 @@ static u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb,
> > return rxb->nr_subframes;
> > }
> >
> > -
> > static size_t rtllib_rx_get_hdrlen(struct rtllib_device *ieee,
> > struct sk_buff *skb,
> > struct rtllib_rx_stats *rx_stats)
> > @@ -1569,7 +1565,6 @@ static int rtllib_verify_qos_info(struct rtllib_qos_information_element
> > return 0;
> > }
> >
> > -
> > /* Parse a QoS parameter element */
> > static int rtllib_read_qos_param_element(
> > struct rtllib_qos_parameter_info *element_param,
> > @@ -1599,7 +1594,6 @@ static int rtllib_read_qos_info_element(
> > return rtllib_verify_qos_info(element_info, QOS_OUI_INFO_SUB_TYPE);
> > }
> >
> > -
> > /* Write QoS parameters from the ac parameters. */
> > static int rtllib_qos_convert_ac_to_parameters(struct rtllib_qos_parameter_info *param_elm,
> > struct rtllib_qos_data *qos_data)
> > @@ -1843,7 +1837,6 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
> > }
> > }
> >
> > -
> > if (*tmp_htinfo_len == 0) {
> > if (info_element->len >= 4 &&
> > info_element->data[0] == 0x00 &&
> > @@ -1932,7 +1925,6 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
> > info_element->data[2] == 0x96)
> > network->cisco_cap_exist = true;
> >
> > -
> > if (info_element->len >= 3 &&
> > info_element->data[0] == 0x00 &&
> > info_element->data[1] == 0x0a &&
> > @@ -2142,13 +2134,11 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
> >
> > network->dtim_data = RTLLIB_DTIM_VALID;
> >
> > -
> > if (info_element->data[2] & 1)
> > network->dtim_data |= RTLLIB_DTIM_MBCAST;
> >
> > offset = (info_element->data[2] >> 1)*2;
> >
> > -
> > if (ieee->assoc_id < 8*offset ||
> > ieee->assoc_id > 8*(offset + info_element->len - 3))
> > break;
> > @@ -2203,7 +2193,6 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
> > &tmp_htcap_len);
> > break;
> >
> > -
> > case MFIE_TYPE_HT_INFO:
> > netdev_dbg(ieee->dev, "MFIE_TYPE_HT_INFO: %d bytes\n",
> > info_element->len);
> > @@ -2392,7 +2381,6 @@ static inline int is_same_network(struct rtllib_network *src,
> > (dst->capability & WLAN_CAPABILITY_ESS)));
> > }
> >
> > -
> > static inline void update_network(struct rtllib_device *ieee,
> > struct rtllib_network *dst,
> > struct rtllib_network *src)
> > @@ -2580,7 +2568,6 @@ static inline void rtllib_process_probe_response(
> > goto free_network;
> > }
> >
> > -
> > if (!rtllib_legal_channel(ieee, network->channel))
> > goto free_network;
> >
> > --
> > 2.34.1
> >
> >