Skip to contentSkip to conversation

Staging: Remove unnecessary goto.

PATCH Superseded Sandhya Bankar 2 participants 7 messages Mar 1, 2016 – Mar 2, 2016

Subsystems (5)
Media (V4L/DVB) Staging IIO Analog Devices IIO drivers +1 more subsystems

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Sandhya Bankar

author
#0 lore raw

v2 cover Staging: Remove unnecessary goto.

Remove unnecessary goto.
changes in v2:
*Simplify the code by adding return statement instead of goto due to which no need of end labels and so there will be no more jumps.

Sandhya Bankar (5):
Staging: gdm72xx: Remove unnecessary goto.
Staging: iio: ade7754: Remove unnecessary goto.
Staging: iio: ade7758_core: Remove unnecessary goto.
Staging: iio: ade7854: Remove unnecessary goto.
Staging: media: Remove unnecessary goto.

 drivers/staging/gdm72xx/usb_boot.c            | 6 ++----
 drivers/staging/iio/meter/ade7754.c           | 5 +----
 drivers/staging/iio/meter/ade7758_core.c      | 5 +----
 drivers/staging/iio/meter/ade7854.c           | 5 +----
 drivers/staging/media/bcm2048/radio-bcm2048.c | 7 ++-----
 5 files changed, 7 insertions(+), 21 deletions(-)
Signature · 1 line
1.8.3.4
author
#1 lore raw

PATCH v2 1/5 Staging: gdm72xx: Remove unnecessary goto.

Remove unnecessary goto.

Signed-off-by Sandhya Bankar <[email protected]>
---
 drivers/staging/gdm72xx/usb_boot.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/gdm72xx/usb_boot.c +2 -4
index 99a5c07..cb6cf77 100644
@@ -252,14 +252,12 @@ static int em_wait_ack(struct usb_device *usbdev, int send_zlp)
 		/*Send ZLP*/
 		ret = gdm_wibro_send(usbdev, NULL, 0);
 		if (ret < 0)
-			goto out;
+			return ret;
 	}
 
 	/*Wait for ACK*/
 	ret = gdm_wibro_recv(usbdev, &ack, sizeof(ack));
-	if (ret < 0)
-		goto out;
-out:
+
 	return ret;
 }
Signature · 1 line
1.8.3.4
author
#2 lore raw

PATCH v2 2/5 Staging: iio: ade7754: Remove unnecessary goto.

In reply to Sandhya Bankar

Remove unnecessary goto.

Signed-off-by Sandhya Bankar <[email protected]>
---
 drivers/staging/iio/meter/ade7754.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/iio/meter/ade7754.c +1 -4
index 1e95068..f4188e1 100644
@@ -347,7 +347,7 @@ static int ade7754_set_irq(struct device *dev, bool enable)
 
 	ret = ade7754_spi_read_reg_16(dev, ADE7754_IRQEN, &irqen);
 	if (ret)
-		goto error_ret;
+		return ret;
 
 	if (enable)
 		irqen |= BIT(14); /* Enables an interrupt when a data is

@@ -356,10 +356,7 @@ static int ade7754_set_irq(struct device *dev, bool enable)
 		irqen &= ~BIT(14);
 
 	ret = ade7754_spi_write_reg_16(dev, ADE7754_IRQEN, irqen);
-	if (ret)
-		goto error_ret;
 
-error_ret:
 	return ret;
 }
Signature · 1 line
1.8.3.4
author
#3 lore raw

PATCH v2 3/5 Staging: iio: ade7758_core: Remove unnecessary goto.

In reply to Sandhya Bankar

Remove unnecessary goto.

Signed-off-by Sandhya Bankar <[email protected]>
---
 drivers/staging/iio/meter/ade7758_core.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/iio/meter/ade7758_core.c +1 -4
index 0db23e4..40f5afa 100644
@@ -423,7 +423,7 @@ int ade7758_set_irq(struct device *dev, bool enable)
 
 	ret = ade7758_spi_read_reg_24(dev, ADE7758_MASK, &irqen);
 	if (ret)
-		goto error_ret;
+		return ret;
 
 	if (enable)
 		irqen |= BIT(16); /* Enables an interrupt when a data is

@@ -432,10 +432,7 @@ int ade7758_set_irq(struct device *dev, bool enable)
 		irqen &= ~BIT(16);
 
 	ret = ade7758_spi_write_reg_24(dev, ADE7758_MASK, irqen);
-	if (ret)
-		goto error_ret;
 
-error_ret:
 	return ret;
 }
Signature · 1 line
1.8.3.4
#4 lore raw

Re: [Outreachy kernel] [PATCH v2 3/5] Staging: iio: ade7758_core: Remove unnecessary goto.

Quoted 21 lines · Sandhya Bankar

Remove unnecessary goto.

Signed-off-by Sandhya Bankar <[email protected]>
---
 drivers/staging/iio/meter/ade7758_core.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/iio/meter/ade7758_core.c +1 -1
index 0db23e4..40f5afa 100644
@@ -423,7 +423,7 @@ int ade7758_set_irq(struct device *dev, bool enable)
 
        ret = ade7758_spi_read_reg_24(dev, ADE7758_MASK, &irqen);
        if (ret)
-               goto error_ret;
+               return ret;
 
        if (enable)
                irqen |= BIT(16); /* Enables an interrupt when a data is

drivers/staging/iio/meter/ade7758_core.c int ade7758_set_irq(struct device *dev, bool enable) · line 434

Quoted 3 lines
drivers/staging/iio/meter/ade7758_core.c +0 -0
@@ -432,10 +432,7 @@ int ade7758_set_irq(struct device *dev, bool enable)
                irqen &= ~BIT(16);
 
        ret = ade7758_spi_write_reg_24(dev, ADE7758_MASK, irqen);

Here you can directly do:

              return ade7758_spi_write_reg_24(dev, ADE7758_MASK, irqen);

I think I didn't explain it very well first time :D.

drivers/staging/iio/meter/ade7758_core.c int ade7758_set_irq(struct device *dev, bool enable) · line 437

Quoted 6 lines
drivers/staging/iio/meter/ade7758_core.c +0 -3
-       if (ret)
-               goto error_ret;
 
-error_ret:
        return ret;
 }

Daniel.

author
#5 lore raw

PATCH v2 4/5 Staging: iio: ade7854: Remove unnecessary goto.

In reply to Sandhya Bankar

Remove unnecessary goto.

Signed-off-by Sandhya Bankar <[email protected]>
---
 drivers/staging/iio/meter/ade7854.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/iio/meter/ade7854.c +1 -4
index a838835..80b1968 100644
@@ -417,7 +417,7 @@ static int ade7854_set_irq(struct device *dev, bool enable)
 
 	ret = st->read_reg_32(dev, ADE7854_MASK0, &irqen);
 	if (ret)
-		goto error_ret;
+		return ret;
 
 	if (enable)
 		irqen |= BIT(17); /* 1: interrupt enabled when all periodical

@@ -426,10 +426,7 @@ static int ade7854_set_irq(struct device *dev, bool enable)
 		irqen &= ~BIT(17);
 
 	ret = st->write_reg_32(dev, ADE7854_MASK0, irqen);
-	if (ret)
-		goto error_ret;
 
-error_ret:
 	return ret;
 }
Signature · 1 line
1.8.3.4
author
#6 lore raw

PATCH v2 5/5 Staging: media: Remove unnecessary goto.

In reply to Sandhya Bankar

Remove unnecessary goto.

Signed-off-by Sandhya Bankar <[email protected]>
---
 drivers/staging/media/bcm2048/radio-bcm2048.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/staging/media/bcm2048/radio-bcm2048.c +2 -5
index 8fdf0ac..abf330f 100644
@@ -1828,17 +1828,14 @@ static int bcm2048_deinit(struct bcm2048_device *bdev)
 
 	err = bcm2048_set_audio_route(bdev, 0);
 	if (err < 0)
-		goto exit;
+		return err;
 
 	err = bcm2048_set_dac_output(bdev, 0);
 	if (err < 0)
-		goto exit;
+		return err;
 
 	err = bcm2048_set_power_state(bdev, BCM2048_POWER_OFF);
-	if (err < 0)
-		goto exit;
 
-exit:
 	return err;
 }
Signature · 1 line
1.8.3.4