Re: [PATCH v1 4/8] parport: Don't shadow error codes in ->probe()

[Nikola Ciprich]

Tested-by: Nikola Ciprich 


pgptPNZbPLjlp.pgp
Description: PGP signature

Re: [PATCH v1 4/8] parport: Don't shadow error codes in ->probe()

[Nikola Ciprich]

Tested-by: Nikola Ciprich 


pgptPNZbPLjlp.pgp
Description: PGP signature

[PATCH v1 4/8] parport: Don't shadow error codes in ->probe()

[Andy Shevchenko]

When ->probe() calls helper functions return theirs error codes
instead of shadowing them.

Signed-off-by: Andy Shevchenko 
---
 drivers/parport/parport_serial.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index ac72ad1cabf5..7cf847e6e660 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -536,12 +536,10 @@ static int serial_register(struct pci_dev *dev, const 
struct pci_device_id *id)
struct serial_private *serial;
 
board = _parport_serial_boards[id->driver_data];
-
if (board->num_ports == 0)
return 0;
 
serial = pciserial_init_ports(dev, board);
-
if (IS_ERR(serial))
return PTR_ERR(serial);
 
@@ -627,14 +625,16 @@ static int parport_serial_pci_probe(struct pci_dev *dev,
if (err)
return err;
 
-   if (parport_register(dev, id))
-   return -ENODEV;
+   err = parport_register(dev, id);
+   if (err)
+   return err;
 
-   if (serial_register (dev, id)) {
+   err = serial_register(dev, id);
+   if (err) {
int i;
for (i = 0; i < priv->num_par; i++)
parport_pc_unregister_port (priv->port[i]);
-   return -ENODEV;
+   return err;
}
 
return 0;
-- 
2.15.1

[PATCH v1 4/8] parport: Don't shadow error codes in ->probe()

[Andy Shevchenko]

When ->probe() calls helper functions return theirs error codes
instead of shadowing them.

Signed-off-by: Andy Shevchenko 
---
 drivers/parport/parport_serial.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index ac72ad1cabf5..7cf847e6e660 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -536,12 +536,10 @@ static int serial_register(struct pci_dev *dev, const 
struct pci_device_id *id)
struct serial_private *serial;
 
board = _parport_serial_boards[id->driver_data];
-
if (board->num_ports == 0)
return 0;
 
serial = pciserial_init_ports(dev, board);
-
if (IS_ERR(serial))
return PTR_ERR(serial);
 
@@ -627,14 +625,16 @@ static int parport_serial_pci_probe(struct pci_dev *dev,
if (err)
return err;
 
-   if (parport_register(dev, id))
-   return -ENODEV;
+   err = parport_register(dev, id);
+   if (err)
+   return err;
 
-   if (serial_register (dev, id)) {
+   err = serial_register(dev, id);
+   if (err) {
int i;
for (i = 0; i < priv->num_par; i++)
parport_pc_unregister_port (priv->port[i]);
-   return -ENODEV;
+   return err;
}
 
return 0;
-- 
2.15.1