Make the code more readable by moving trivial
initializations up with the declarations instead
of wasting a line on that.
Signed-off-by: Erick Karanja <karanja99erick@gmail.com>
---
.../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 39 ++++++-------------
1 file changed, 11 insertions(+), 28 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index 5dc1c12fe03e..d134d185bfae 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -120,13 +120,10 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter)
*/
s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
{
- struct xmit_priv *pxmitpriv;
+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
u8 queue_empty, queue_pending;
s32 ret;
-
- pxmitpriv = &padapter->xmitpriv;
-
if (wait_for_completion_interruptible(&pxmitpriv->xmit_comp)) {
netdev_emerg(padapter->pnetdev,
"%s: down SdioXmitBufSema fail!\n", __func__);
@@ -242,8 +239,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
/* pxmitbuf->priv_data will be NULL, and will crash here */
if (pxmitbuf->len > 0 &&
pxmitbuf->priv_data) {
- struct xmit_frame *pframe;
- pframe = (struct xmit_frame *)pxmitbuf->priv_data;
+ struct xmit_frame *pframe = (struct xmit_frame *)pxmitbuf->priv_data;
pframe->agg_num = k;
pxmitbuf->agg_num = k;
rtl8723b_update_txdesc(pframe, pframe->buf_addr);
@@ -326,8 +322,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
/* dump xmit_buf to hw tx fifo */
if (pxmitbuf) {
if (pxmitbuf->len > 0) {
- struct xmit_frame *pframe;
- pframe = (struct xmit_frame *)pxmitbuf->priv_data;
+ struct xmit_frame *pframe = (struct xmit_frame *)pxmitbuf->priv_data;
pframe->agg_num = k;
pxmitbuf->agg_num = k;
rtl8723b_update_txdesc(pframe, pframe->buf_addr);
@@ -357,12 +352,9 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
*/
static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
{
- struct xmit_priv *pxmitpriv;
+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
s32 ret;
-
- pxmitpriv = &padapter->xmitpriv;
-
if (wait_for_completion_interruptible(&pxmitpriv->SdioXmitStart)) {
netdev_emerg(padapter->pnetdev, "%s: SdioXmitStart fail!\n",
__func__);
@@ -408,13 +400,9 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
int rtl8723bs_xmit_thread(void *context)
{
- s32 ret;
- struct adapter *padapter;
- struct xmit_priv *pxmitpriv;
-
- ret = _SUCCESS;
- padapter = context;
- pxmitpriv = &padapter->xmitpriv;
+ s32 ret = _SUCCESS;
+ struct adapter *padapter = context;
+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
allow_signal(SIGTERM);
@@ -435,16 +423,13 @@ s32 rtl8723bs_mgnt_xmit(
)
{
s32 ret = _SUCCESS;
- struct pkt_attrib *pattrib;
- struct xmit_buf *pxmitbuf;
+ struct pkt_attrib *pattrib = &pmgntframe->attrib;
+ struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
u8 *pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
u8 txdesc_size = TXDESC_SIZE;
- pattrib = &pmgntframe->attrib;
- pxmitbuf = pmgntframe->pxmitbuf;
-
rtl8723b_update_txdesc(pmgntframe, pmgntframe->buf_addr);
pxmitbuf->len = txdesc_size + pattrib->last_txcmdsz;
@@ -557,15 +542,13 @@ s32 rtl8723bs_init_xmit_priv(struct adapter *padapter)
void rtl8723bs_free_xmit_priv(struct adapter *padapter)
{
- struct xmit_priv *pxmitpriv;
+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct xmit_buf *pxmitbuf;
- struct __queue *pqueue;
+ struct __queue *pqueue = &pxmitpriv->pending_xmitbuf_queue;
struct list_head *plist, *phead;
struct list_head tmplist;
- pxmitpriv = &padapter->xmitpriv;
- pqueue = &pxmitpriv->pending_xmitbuf_queue;
phead = get_list_head(pqueue);
INIT_LIST_HEAD(&tmplist);
--
2.43.0
On Wed, 9 Apr 2025, Erick Karanja wrote:
> Make the code more readable by moving trivial
> initializations up with the declarations instead
> of wasting a line on that.
>
> Signed-off-by: Erick Karanja <karanja99erick@gmail.com>
> ---
> .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 39 ++++++-------------
> 1 file changed, 11 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> index 5dc1c12fe03e..d134d185bfae 100644
> --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> @@ -120,13 +120,10 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter)
> */
> s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
> {
> - struct xmit_priv *pxmitpriv;
> + struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
> u8 queue_empty, queue_pending;
> s32 ret;
>
> -
> - pxmitpriv = &padapter->xmitpriv;
> -
> if (wait_for_completion_interruptible(&pxmitpriv->xmit_comp)) {
> netdev_emerg(padapter->pnetdev,
> "%s: down SdioXmitBufSema fail!\n", __func__);
> @@ -242,8 +239,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
> /* pxmitbuf->priv_data will be NULL, and will crash here */
> if (pxmitbuf->len > 0 &&
> pxmitbuf->priv_data) {
> - struct xmit_frame *pframe;
> - pframe = (struct xmit_frame *)pxmitbuf->priv_data;
> + struct xmit_frame *pframe = (struct xmit_frame *)pxmitbuf->priv_data;
I'm not sure that it's worth making this change here given that it makes
the line even longer.
> pframe->agg_num = k;
> pxmitbuf->agg_num = k;
> rtl8723b_update_txdesc(pframe, pframe->buf_addr);
> @@ -326,8 +322,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
> /* dump xmit_buf to hw tx fifo */
> if (pxmitbuf) {
> if (pxmitbuf->len > 0) {
> - struct xmit_frame *pframe;
> - pframe = (struct xmit_frame *)pxmitbuf->priv_data;
> + struct xmit_frame *pframe = (struct xmit_frame *)pxmitbuf->priv_data;
This also makes a long line.
> pframe->agg_num = k;
> pxmitbuf->agg_num = k;
> rtl8723b_update_txdesc(pframe, pframe->buf_addr);
> @@ -357,12 +352,9 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
> */
> static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
> {
> - struct xmit_priv *pxmitpriv;
> + struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
> s32 ret;
>
> -
> - pxmitpriv = &padapter->xmitpriv;
> -
> if (wait_for_completion_interruptible(&pxmitpriv->SdioXmitStart)) {
> netdev_emerg(padapter->pnetdev, "%s: SdioXmitStart fail!\n",
> __func__);
> @@ -408,13 +400,9 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
>
> int rtl8723bs_xmit_thread(void *context)
> {
> - s32 ret;
> - struct adapter *padapter;
> - struct xmit_priv *pxmitpriv;
> -
> - ret = _SUCCESS;
> - padapter = context;
> - pxmitpriv = &padapter->xmitpriv;
> + s32 ret = _SUCCESS;
> + struct adapter *padapter = context;
> + struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
>
> allow_signal(SIGTERM);
>
> @@ -435,16 +423,13 @@ s32 rtl8723bs_mgnt_xmit(
> )
> {
> s32 ret = _SUCCESS;
> - struct pkt_attrib *pattrib;
> - struct xmit_buf *pxmitbuf;
> + struct pkt_attrib *pattrib = &pmgntframe->attrib;
> + struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;
> struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
> struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
> u8 *pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
> u8 txdesc_size = TXDESC_SIZE;
>
> - pattrib = &pmgntframe->attrib;
> - pxmitbuf = pmgntframe->pxmitbuf;
> -
> rtl8723b_update_txdesc(pmgntframe, pmgntframe->buf_addr);
>
> pxmitbuf->len = txdesc_size + pattrib->last_txcmdsz;
> @@ -557,15 +542,13 @@ s32 rtl8723bs_init_xmit_priv(struct adapter *padapter)
>
> void rtl8723bs_free_xmit_priv(struct adapter *padapter)
> {
> - struct xmit_priv *pxmitpriv;
> + struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
> struct xmit_buf *pxmitbuf;
> - struct __queue *pqueue;
> + struct __queue *pqueue = &pxmitpriv->pending_xmitbuf_queue;
> struct list_head *plist, *phead;
> struct list_head tmplist;
>
>
> - pxmitpriv = &padapter->xmitpriv;
> - pqueue = &pxmitpriv->pending_xmitbuf_queue;
> phead = get_list_head(pqueue);
> INIT_LIST_HEAD(&tmplist);
>
> --
> 2.43.0
>
>
>
On Wed, 2025-04-09 at 11:41 -0400, Julia Lawall wrote:
>
>
> On Wed, 9 Apr 2025, Erick Karanja wrote:
>
> > Make the code more readable by moving trivial
> > initializations up with the declarations instead
> > of wasting a line on that.
> >
> > Signed-off-by: Erick Karanja <karanja99erick@gmail.com>
> > ---
> > .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 39 ++++++---------
> > ----
> > 1 file changed, 11 insertions(+), 28 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> > b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> > index 5dc1c12fe03e..d134d185bfae 100644
> > --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> > +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> > @@ -120,13 +120,10 @@ static s32 rtl8723_dequeue_writeport(struct
> > adapter *padapter)
> > */
> > s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
> > {
> > - struct xmit_priv *pxmitpriv;
> > + struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
> > u8 queue_empty, queue_pending;
> > s32 ret;
> >
> > -
> > - pxmitpriv = &padapter->xmitpriv;
> > -
> > if (wait_for_completion_interruptible(&pxmitpriv-
> > >xmit_comp)) {
> > netdev_emerg(padapter->pnetdev,
> > "%s: down SdioXmitBufSema fail!\n",
> > __func__);
> > @@ -242,8 +239,7 @@ static s32 xmit_xmitframes(struct adapter
> > *padapter, struct xmit_priv *pxmitpriv
> > /* pxmitbuf-
> > >priv_data will be NULL, and will crash here */
> > if (pxmitbuf->len
> > > 0 &&
> > pxmitbuf-
> > >priv_data) {
> > - struct
> > xmit_frame *pframe;
> > - pframe =
> > (struct xmit_frame *)pxmitbuf->priv_data;
> > + struct
> > xmit_frame *pframe = (struct xmit_frame *)pxmitbuf->priv_data;
>
> I'm not sure that it's worth making this change here given that it
> makes
> the line even longer.
Hello Julia. I will make the necessary changes.
Thank you.
>
> > pframe-
> > >agg_num = k;
> > pxmitbuf-
> > >agg_num = k;
> > rtl8723b_u
> > pdate_txdesc(pframe, pframe->buf_addr);
> > @@ -326,8 +322,7 @@ static s32 xmit_xmitframes(struct adapter
> > *padapter, struct xmit_priv *pxmitpriv
> > /* dump xmit_buf to hw tx fifo */
> > if (pxmitbuf) {
> > if (pxmitbuf->len > 0) {
> > - struct xmit_frame *pframe;
> > - pframe = (struct xmit_frame
> > *)pxmitbuf->priv_data;
> > + struct xmit_frame *pframe =
> > (struct xmit_frame *)pxmitbuf->priv_data;
>
> This also makes a long line.
>
> > pframe->agg_num = k;
> > pxmitbuf->agg_num = k;
> > rtl8723b_update_txdesc(pframe,
> > pframe->buf_addr);
> > @@ -357,12 +352,9 @@ static s32 xmit_xmitframes(struct adapter
> > *padapter, struct xmit_priv *pxmitpriv
> > */
> > static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
> > {
> > - struct xmit_priv *pxmitpriv;
> > + struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
> > s32 ret;
> >
> > -
> > - pxmitpriv = &padapter->xmitpriv;
> > -
> > if (wait_for_completion_interruptible(&pxmitpriv-
> > >SdioXmitStart)) {
> > netdev_emerg(padapter->pnetdev, "%s: SdioXmitStart
> > fail!\n",
> > __func__);
> > @@ -408,13 +400,9 @@ static s32 rtl8723bs_xmit_handler(struct
> > adapter *padapter)
> >
> > int rtl8723bs_xmit_thread(void *context)
> > {
> > - s32 ret;
> > - struct adapter *padapter;
> > - struct xmit_priv *pxmitpriv;
> > -
> > - ret = _SUCCESS;
> > - padapter = context;
> > - pxmitpriv = &padapter->xmitpriv;
> > + s32 ret = _SUCCESS;
> > + struct adapter *padapter = context;
> > + struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
> >
> > allow_signal(SIGTERM);
> >
> > @@ -435,16 +423,13 @@ s32 rtl8723bs_mgnt_xmit(
> > )
> > {
> > s32 ret = _SUCCESS;
> > - struct pkt_attrib *pattrib;
> > - struct xmit_buf *pxmitbuf;
> > + struct pkt_attrib *pattrib = &pmgntframe->attrib;
> > + struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;
> > struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
> > struct dvobj_priv *pdvobjpriv =
> > adapter_to_dvobj(padapter);
> > u8 *pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
> > u8 txdesc_size = TXDESC_SIZE;
> >
> > - pattrib = &pmgntframe->attrib;
> > - pxmitbuf = pmgntframe->pxmitbuf;
> > -
> > rtl8723b_update_txdesc(pmgntframe, pmgntframe->buf_addr);
> >
> > pxmitbuf->len = txdesc_size + pattrib->last_txcmdsz;
> > @@ -557,15 +542,13 @@ s32 rtl8723bs_init_xmit_priv(struct adapter
> > *padapter)
> >
> > void rtl8723bs_free_xmit_priv(struct adapter *padapter)
> > {
> > - struct xmit_priv *pxmitpriv;
> > + struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
> > struct xmit_buf *pxmitbuf;
> > - struct __queue *pqueue;
> > + struct __queue *pqueue = &pxmitpriv-
> > >pending_xmitbuf_queue;
> > struct list_head *plist, *phead;
> > struct list_head tmplist;
> >
> >
> > - pxmitpriv = &padapter->xmitpriv;
> > - pqueue = &pxmitpriv->pending_xmitbuf_queue;
> > phead = get_list_head(pqueue);
> > INIT_LIST_HEAD(&tmplist);
> >
> > --
> > 2.43.0
> >
> >
> >
© 2016 - 2026 Red Hat, Inc.