[PATCH] Staging: rtl8188eu: hal: Compress return logic into one line

[PATCH] Staging: rtl8188eu: hal: Compress return logic into one line

[Mihaela Muraru]

Simplify function returns by merging assignment and return into
one command line.
Found with Coccinelle
@@
expression e, ret;
@@

-ret =
+return
        e;
-return ret;

Signed-off-by: Mihaela Muraru <mihaela.muraru21@gmail.com>
---
 ret.out | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 ret.out

diff --git a/ret.out b/ret.out
new file mode 100644
index 0000000..fd4d380
--- /dev/null
+++ b/ret.out
@@ -0,0 +1,22 @@
+--- /home/domino/git/kernels/staging/drivers/staging/rtl8188eu/hal/phy.c
++++ /tmp/cocci-output-5790-5d9d37-phy.c
+@@ -44,8 +44,7 @@ u32 phy_query_bb_reg(struct adapter *ada
+ 
+ 	original_value = usb_read32(adapt, regaddr);
+ 	bit_shift = cal_bit_shift(bitmask);
+-	return_value = (original_value & bitmask) >> bit_shift;
+-	return return_value;
++	return (original_value & bitmask) >> bit_shift;
+ }
+ 
+ void phy_set_bb_reg(struct adapter *adapt, u32 regaddr, u32 bitmask, u32 data)
+@@ -123,8 +122,7 @@ u32 rtw_hal_read_rfreg(struct adapter *a
+ 
+ 	original_value = rf_serial_read(adapt, rf_path, reg_addr);
+ 	bit_shift =  cal_bit_shift(bit_mask);
+-	readback_value = (original_value & bit_mask) >> bit_shift;
+-	return readback_value;
++	return (original_value & bit_mask) >> bit_shift;
+ }
+ 
+ void phy_set_rf_reg(struct adapter *adapt, enum rf_radio_path rf_path,
-- 
2.7.4

Re: [Outreachy kernel] [PATCH] Staging: rtl8188eu: hal: Compress return logic into one line

[Julia Lawall]

On Thu, 13 Oct 2016, Mihaela Muraru wrote:

> Simplify function returns by merging assignment and return into
> one command line.
> Found with Coccinelle
> @@
> expression e, ret;
> @@
>
> -ret =
> +return
>         e;
> -return ret;
>
> Signed-off-by: Mihaela Muraru <mihaela.muraru21@gmail.com>
> ---
>  ret.out | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>  create mode 100644 ret.out
>
> diff --git a/ret.out b/ret.out
> new file mode 100644
> index 0000000..fd4d380
> --- /dev/null
> +++ b/ret.out
> @@ -0,0 +1,22 @@
> +--- /home/domino/git/kernels/staging/drivers/staging/rtl8188eu/hal/phy.c
> ++++ /tmp/cocci-output-5790-5d9d37-phy.c
> +@@ -44,8 +44,7 @@ u32 phy_query_bb_reg(struct adapter *ada
> +
> + 	original_value = usb_read32(adapt, regaddr);
> + 	bit_shift = cal_bit_shift(bitmask);
> +-	return_value = (original_value & bitmask) >> bit_shift;
> +-	return return_value;
> ++	return (original_value & bitmask) >> bit_shift;
> + }

Something went quite wrong here.

julia


> +
> + void phy_set_bb_reg(struct adapter *adapt, u32 regaddr, u32 bitmask, u32 data)
> +@@ -123,8 +122,7 @@ u32 rtw_hal_read_rfreg(struct adapter *a
> +
> + 	original_value = rf_serial_read(adapt, rf_path, reg_addr);
> + 	bit_shift =  cal_bit_shift(bit_mask);
> +-	readback_value = (original_value & bit_mask) >> bit_shift;
> +-	return readback_value;
> ++	return (original_value & bit_mask) >> bit_shift;
> + }
> +
> + void phy_set_rf_reg(struct adapter *adapt, enum rf_radio_path rf_path,
> --
> 2.7.4
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20161013084120.GA6373%40domino-MS-16Y1.
> For more options, visit https://groups.google.com/d/optout.
>

Re: [PATCH] Staging: rtl8188eu: hal: Compress return logic into one line

[Greg Kroah-Hartman]

On Thu, Oct 13, 2016 at 11:41:20AM +0300, Mihaela Muraru wrote:
> Simplify function returns by merging assignment and return into
> one command line.
> Found with Coccinelle
> @@
> expression e, ret;
> @@
> 
> -ret =
> +return
>         e;
> -return ret;
> 
> Signed-off-by: Mihaela Muraru <mihaela.muraru21@gmail.com>
> ---
>  ret.out | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>  create mode 100644 ret.out
> 
> diff --git a/ret.out b/ret.out
> new file mode 100644
> index 0000000..fd4d380
> --- /dev/null
> +++ b/ret.out
> @@ -0,0 +1,22 @@
> +--- /home/domino/git/kernels/staging/drivers/staging/rtl8188eu/hal/phy.c
> ++++ /tmp/cocci-output-5790-5d9d37-phy.c
> +@@ -44,8 +44,7 @@ u32 phy_query_bb_reg(struct adapter *ada
> + 
> + 	original_value = usb_read32(adapt, regaddr);
> + 	bit_shift = cal_bit_shift(bitmask);
> +-	return_value = (original_value & bitmask) >> bit_shift;
> +-	return return_value;
> ++	return (original_value & bitmask) >> bit_shift;
> + }
> + 
> + void phy_set_bb_reg(struct adapter *adapt, u32 regaddr, u32 bitmask, u32 data)
> +@@ -123,8 +122,7 @@ u32 rtw_hal_read_rfreg(struct adapter *a
> + 
> + 	original_value = rf_serial_read(adapt, rf_path, reg_addr);
> + 	bit_shift =  cal_bit_shift(bit_mask);
> +-	readback_value = (original_value & bit_mask) >> bit_shift;
> +-	return readback_value;
> ++	return (original_value & bit_mask) >> bit_shift;
> + }
> + 
> + void phy_set_rf_reg(struct adapter *adapt, enum rf_radio_path rf_path,

Your patch just adds a patch to the tree, not what I think you ment to
send here :)

Care to try it again?

thanks,

greg k-h

Re: [Outreachy kernel] Re: [PATCH] Staging: rtl8188eu: hal: Compress return logic into one line

[Julia Lawall]

On Thu, 13 Oct 2016, Greg Kroah-Hartman wrote:

> On Thu, Oct 13, 2016 at 11:41:20AM +0300, Mihaela Muraru wrote:
> > Simplify function returns by merging assignment and return into
> > one command line.
> > Found with Coccinelle
> > @@
> > expression e, ret;
> > @@
> >
> > -ret =
> > +return
> >         e;
> > -return ret;
> >
> > Signed-off-by: Mihaela Muraru <mihaela.muraru21@gmail.com>
> > ---
> >  ret.out | 22 ++++++++++++++++++++++
> >  1 file changed, 22 insertions(+)
> >  create mode 100644 ret.out
> >
> > diff --git a/ret.out b/ret.out
> > new file mode 100644
> > index 0000000..fd4d380
> > --- /dev/null
> > +++ b/ret.out
> > @@ -0,0 +1,22 @@
> > +--- /home/domino/git/kernels/staging/drivers/staging/rtl8188eu/hal/phy.c
> > ++++ /tmp/cocci-output-5790-5d9d37-phy.c
> > +@@ -44,8 +44,7 @@ u32 phy_query_bb_reg(struct adapter *ada
> > +
> > + 	original_value = usb_read32(adapt, regaddr);
> > + 	bit_shift = cal_bit_shift(bitmask);
> > +-	return_value = (original_value & bitmask) >> bit_shift;
> > +-	return return_value;
> > ++	return (original_value & bitmask) >> bit_shift;
> > + }
> > +
> > + void phy_set_bb_reg(struct adapter *adapt, u32 regaddr, u32 bitmask, u32 data)
> > +@@ -123,8 +122,7 @@ u32 rtw_hal_read_rfreg(struct adapter *a
> > +
> > + 	original_value = rf_serial_read(adapt, rf_path, reg_addr);
> > + 	bit_shift =  cal_bit_shift(bit_mask);
> > +-	readback_value = (original_value & bit_mask) >> bit_shift;
> > +-	return readback_value;
> > ++	return (original_value & bit_mask) >> bit_shift;
> > + }
> > +
> > + void phy_set_rf_reg(struct adapter *adapt, enum rf_radio_path rf_path,
>
> Your patch just adds a patch to the tree, not what I think you ment to
> send here :)
>
> Care to try it again?

You should apply the patch generated by Coccinelle, using patch -p1 <
ret.out

julia

Re: [PATCH] Staging: rtl8188eu: hal: Compress return logic into one line

[Muraru Mihaela]

On Thu, Oct 13, 2016 at 10:53:49AM +0200, Greg Kroah-Hartman wrote:
> On Thu, Oct 13, 2016 at 11:41:20AM +0300, Mihaela Muraru wrote:
> > Simplify function returns by merging assignment and return into
> > one command line.
> > Found with Coccinelle
> > @@
> > expression e, ret;
> > @@
> > 
> > -ret =
> > +return
> >         e;
> > -return ret;
> > 
> > Signed-off-by: Mihaela Muraru <mihaela.muraru21@gmail.com>
> > ---
> >  ret.out | 22 ++++++++++++++++++++++
> >  1 file changed, 22 insertions(+)
> >  create mode 100644 ret.out
> > 
> > diff --git a/ret.out b/ret.out
> > new file mode 100644
> > index 0000000..fd4d380
> > --- /dev/null
> > +++ b/ret.out
> > @@ -0,0 +1,22 @@
> > +--- /home/domino/git/kernels/staging/drivers/staging/rtl8188eu/hal/phy.c
> > ++++ /tmp/cocci-output-5790-5d9d37-phy.c
> > +@@ -44,8 +44,7 @@ u32 phy_query_bb_reg(struct adapter *ada
> > + 
> > + 	original_value = usb_read32(adapt, regaddr);
> > + 	bit_shift = cal_bit_shift(bitmask);
> > +-	return_value = (original_value & bitmask) >> bit_shift;
> > +-	return return_value;
> > ++	return (original_value & bitmask) >> bit_shift;
> > + }
> > + 
> > + void phy_set_bb_reg(struct adapter *adapt, u32 regaddr, u32 bitmask, u32 data)
> > +@@ -123,8 +122,7 @@ u32 rtw_hal_read_rfreg(struct adapter *a
> > + 
> > + 	original_value = rf_serial_read(adapt, rf_path, reg_addr);
> > + 	bit_shift =  cal_bit_shift(bit_mask);
> > +-	readback_value = (original_value & bit_mask) >> bit_shift;
> > +-	return readback_value;
> > ++	return (original_value & bit_mask) >> bit_shift;
> > + }
> > + 
> > + void phy_set_rf_reg(struct adapter *adapt, enum rf_radio_path rf_path,
> 
> Your patch just adds a patch to the tree, not what I think you ment to
> send here :)
 
> Care to try it again?

Thanks for reply, i will send it again :)

mihaela
 
> thanks,
> 
> greg k-h