Message ID | be36ce5f-9e75-6c05-86a2-ea8368f09dc1@users.sourceforge.net |
---|---|
State | Rejected |
Headers | show |
Series | I2C-PIIX4: Use common error handling code in piix4_probe() | expand |
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.
> I'm no longer taking patches from you.
Why do you not like another update suggestion for this use case?
Regards,
Markus
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)