* [PATCH v2 1/5] Staging: gdm72xx: Remove unnecessary goto.
2016-03-01 12:46 [PATCH v2 0/5] Staging: Remove unnecessary goto Sandhya Bankar
@ 2016-03-01 12:48 ` Sandhya Bankar
2016-03-01 12:50 ` [PATCH v2 2/5] Staging: iio: ade7754: " Sandhya Bankar
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Sandhya Bankar @ 2016-03-01 12:48 UTC (permalink / raw)
To: outreachy-kernel
Remove unnecessary goto.
Signed-off-by: Sandhya Bankar <bankarsandhya512@gmail.com>
---
drivers/staging/gdm72xx/usb_boot.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/gdm72xx/usb_boot.c b/drivers/staging/gdm72xx/usb_boot.c
index 99a5c07..cb6cf77 100644
--- a/drivers/staging/gdm72xx/usb_boot.c
+++ b/drivers/staging/gdm72xx/usb_boot.c
@@ -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;
}
--
1.8.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 2/5] Staging: iio: ade7754: Remove unnecessary goto.
2016-03-01 12:46 [PATCH v2 0/5] Staging: Remove unnecessary goto Sandhya Bankar
2016-03-01 12:48 ` [PATCH v2 1/5] Staging: gdm72xx: " Sandhya Bankar
@ 2016-03-01 12:50 ` Sandhya Bankar
2016-03-01 12:51 ` [PATCH v2 3/5] Staging: iio: ade7758_core: " Sandhya Bankar
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Sandhya Bankar @ 2016-03-01 12:50 UTC (permalink / raw)
To: outreachy-kernel
Remove unnecessary goto.
Signed-off-by: Sandhya Bankar <bankarsandhya512@gmail.com>
---
drivers/staging/iio/meter/ade7754.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index 1e95068..f4188e1 100644
--- a/drivers/staging/iio/meter/ade7754.c
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -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;
}
--
1.8.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 3/5] Staging: iio: ade7758_core: Remove unnecessary goto.
2016-03-01 12:46 [PATCH v2 0/5] Staging: Remove unnecessary goto Sandhya Bankar
2016-03-01 12:48 ` [PATCH v2 1/5] Staging: gdm72xx: " Sandhya Bankar
2016-03-01 12:50 ` [PATCH v2 2/5] Staging: iio: ade7754: " Sandhya Bankar
@ 2016-03-01 12:51 ` Sandhya Bankar
2016-03-02 12:27 ` [Outreachy kernel] " Daniel Baluta
2016-03-01 12:53 ` [PATCH v2 4/5] Staging: iio: ade7854: " Sandhya Bankar
2016-03-01 12:55 ` [PATCH v2 5/5] Staging: media: " Sandhya Bankar
4 siblings, 1 reply; 7+ messages in thread
From: Sandhya Bankar @ 2016-03-01 12:51 UTC (permalink / raw)
To: outreachy-kernel
Remove unnecessary goto.
Signed-off-by: Sandhya Bankar <bankarsandhya512@gmail.com>
---
drivers/staging/iio/meter/ade7758_core.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
index 0db23e4..40f5afa 100644
--- a/drivers/staging/iio/meter/ade7758_core.c
+++ b/drivers/staging/iio/meter/ade7758_core.c
@@ -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;
}
--
1.8.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Outreachy kernel] [PATCH v2 3/5] Staging: iio: ade7758_core: Remove unnecessary goto.
2016-03-01 12:51 ` [PATCH v2 3/5] Staging: iio: ade7758_core: " Sandhya Bankar
@ 2016-03-02 12:27 ` Daniel Baluta
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Baluta @ 2016-03-02 12:27 UTC (permalink / raw)
To: Sandhya Bankar; +Cc: outreachy-kernel
On Tue, Mar 1, 2016 at 2:51 PM, Sandhya Bankar
<bankarsandhya512@gmail.com> wrote:
> Remove unnecessary goto.
>
> Signed-off-by: Sandhya Bankar <bankarsandhya512@gmail.com>
> ---
> drivers/staging/iio/meter/ade7758_core.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
> index 0db23e4..40f5afa 100644
> --- a/drivers/staging/iio/meter/ade7758_core.c
> +++ b/drivers/staging/iio/meter/ade7758_core.c
> @@ -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);
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.
> - if (ret)
> - goto error_ret;
>
> -error_ret:
> return ret;
> }
Daniel.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 4/5] Staging: iio: ade7854: Remove unnecessary goto.
2016-03-01 12:46 [PATCH v2 0/5] Staging: Remove unnecessary goto Sandhya Bankar
` (2 preceding siblings ...)
2016-03-01 12:51 ` [PATCH v2 3/5] Staging: iio: ade7758_core: " Sandhya Bankar
@ 2016-03-01 12:53 ` Sandhya Bankar
2016-03-01 12:55 ` [PATCH v2 5/5] Staging: media: " Sandhya Bankar
4 siblings, 0 replies; 7+ messages in thread
From: Sandhya Bankar @ 2016-03-01 12:53 UTC (permalink / raw)
To: outreachy-kernel
Remove unnecessary goto.
Signed-off-by: Sandhya Bankar <bankarsandhya512@gmail.com>
---
drivers/staging/iio/meter/ade7854.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/staging/iio/meter/ade7854.c b/drivers/staging/iio/meter/ade7854.c
index a838835..80b1968 100644
--- a/drivers/staging/iio/meter/ade7854.c
+++ b/drivers/staging/iio/meter/ade7854.c
@@ -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;
}
--
1.8.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 5/5] Staging: media: Remove unnecessary goto.
2016-03-01 12:46 [PATCH v2 0/5] Staging: Remove unnecessary goto Sandhya Bankar
` (3 preceding siblings ...)
2016-03-01 12:53 ` [PATCH v2 4/5] Staging: iio: ade7854: " Sandhya Bankar
@ 2016-03-01 12:55 ` Sandhya Bankar
4 siblings, 0 replies; 7+ messages in thread
From: Sandhya Bankar @ 2016-03-01 12:55 UTC (permalink / raw)
To: outreachy-kernel
Remove unnecessary goto.
Signed-off-by: Sandhya Bankar <bankarsandhya512@gmail.com>
---
drivers/staging/media/bcm2048/radio-bcm2048.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index 8fdf0ac..abf330f 100644
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -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;
}
--
1.8.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread