All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] I2C-PIIX4: Use common error handling code in piix4_probe()
@ 2017-10-25 11:40 ` SF Markus Elfring
  0 siblings, 0 replies; 6+ messages in thread
From: SF Markus Elfring @ 2017-10-25 11:40 UTC (permalink / raw)
  To: linux-i2c, Jean Delvare, Wolfram Sang; +Cc: LKML, kernel-janitors

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 25 Oct 2017 13:30:18 +0200

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/i2c/busses/i2c-piix4.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 0ecdb47a23ab..22cc56e9f304 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -780,20 +780,16 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
 		/* base address location etc changed in SB800 */
 		retval = piix4_setup_sb800(dev, id, 0);
-		if (retval < 0) {
-			release_region(SB800_PIIX4_SMB_IDX, 2);
-			return retval;
-		}
+		if (retval < 0)
+			goto release_region;
 
 		/*
 		 * Try to register multiplexed main SMBus adapter,
 		 * give up if we can't
 		 */
 		retval = piix4_add_adapters_sb800(dev, retval);
-		if (retval < 0) {
-			release_region(SB800_PIIX4_SMB_IDX, 2);
-			return retval;
-		}
+		if (retval < 0)
+			goto release_region;
 	} else {
 		retval = piix4_setup(dev, id);
 		if (retval < 0)
@@ -833,6 +829,10 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
 	}
 
 	return 0;
+
+release_region:
+	release_region(SB800_PIIX4_SMB_IDX, 2);
+	return retval;
 }
 
 static void piix4_adap_remove(struct i2c_adapter *adap)
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] I2C-PIIX4: Use common error handling code in piix4_probe()
@ 2017-10-25 11:40 ` SF Markus Elfring
  0 siblings, 0 replies; 6+ messages in thread
From: SF Markus Elfring @ 2017-10-25 11:40 UTC (permalink / raw)
  To: linux-i2c, Jean Delvare, Wolfram Sang; +Cc: LKML, kernel-janitors

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 25 Oct 2017 13:30:18 +0200

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/i2c/busses/i2c-piix4.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 0ecdb47a23ab..22cc56e9f304 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -780,20 +780,16 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
 		/* base address location etc changed in SB800 */
 		retval = piix4_setup_sb800(dev, id, 0);
-		if (retval < 0) {
-			release_region(SB800_PIIX4_SMB_IDX, 2);
-			return retval;
-		}
+		if (retval < 0)
+			goto release_region;
 
 		/*
 		 * Try to register multiplexed main SMBus adapter,
 		 * give up if we can't
 		 */
 		retval = piix4_add_adapters_sb800(dev, retval);
-		if (retval < 0) {
-			release_region(SB800_PIIX4_SMB_IDX, 2);
-			return retval;
-		}
+		if (retval < 0)
+			goto release_region;
 	} else {
 		retval = piix4_setup(dev, id);
 		if (retval < 0)
@@ -833,6 +829,10 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
 	}
 
 	return 0;
+
+release_region:
+	release_region(SB800_PIIX4_SMB_IDX, 2);
+	return retval;
 }
 
 static void piix4_adap_remove(struct i2c_adapter *adap)
-- 
2.14.3


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] I2C-PIIX4: Use common error handling code in piix4_probe()
  2017-10-25 11:40 ` SF Markus Elfring
@ 2017-10-25 14:33   ` Jean Delvare
  -1 siblings, 0 replies; 6+ messages in thread
From: Jean Delvare @ 2017-10-25 14:33 UTC (permalink / raw)
  To: SF Markus Elfring, linux-i2c, Wolfram Sang; +Cc: LKML, kernel-janitors

On mer., 2017-10-25 at 13:40 +0200, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 25 Oct 2017 13:30:18 +0200
> 
> Add a jump target so that a bit of exception handling can be better reused
> at the end of this function.
> 
> This issue was detected by using the Coccinelle software.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

I'm no longer taking patches from you.

-- 
Jean Delvare
SUSE L3 Support

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] I2C-PIIX4: Use common error handling code in piix4_probe()
@ 2017-10-25 14:33   ` Jean Delvare
  0 siblings, 0 replies; 6+ messages in thread
From: Jean Delvare @ 2017-10-25 14:33 UTC (permalink / raw)
  To: SF Markus Elfring, linux-i2c, Wolfram Sang; +Cc: LKML, kernel-janitors

On mer., 2017-10-25 at 13:40 +0200, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 25 Oct 2017 13:30:18 +0200
> 
> Add a jump target so that a bit of exception handling can be better reused
> at the end of this function.
> 
> This issue was detected by using the Coccinelle software.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

I'm no longer taking patches from you.

-- 
Jean Delvare
SUSE L3 Support

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: I2C-PIIX4: Use common error handling code in piix4_probe()
  2017-10-25 14:33   ` Jean Delvare
@ 2017-10-25 14:37     ` SF Markus Elfring
  -1 siblings, 0 replies; 6+ messages in thread
From: SF Markus Elfring @ 2017-10-25 14:37 UTC (permalink / raw)
  To: Jean Delvare, linux-i2c; +Cc: Wolfram Sang, LKML, kernel-janitors

> I'm no longer taking patches from you.

Why do you not like another update suggestion for this use case?

Regards,
Markus

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: I2C-PIIX4: Use common error handling code in piix4_probe()
@ 2017-10-25 14:37     ` SF Markus Elfring
  0 siblings, 0 replies; 6+ messages in thread
From: SF Markus Elfring @ 2017-10-25 14:37 UTC (permalink / raw)
  To: Jean Delvare, linux-i2c; +Cc: Wolfram Sang, LKML, kernel-janitors

> I'm no longer taking patches from you.

Why do you not like another update suggestion for this use case?

Regards,
Markus

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-10-25 14:37 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-25 11:40 [PATCH] I2C-PIIX4: Use common error handling code in piix4_probe() SF Markus Elfring
2017-10-25 11:40 ` SF Markus Elfring
2017-10-25 14:33 ` Jean Delvare
2017-10-25 14:33   ` Jean Delvare
2017-10-25 14:37   ` SF Markus Elfring
2017-10-25 14:37     ` SF Markus Elfring

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.