[PATCH] serial: trivial code flow simplification

Return failure immediately, so we don't have to test it twice.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index d3d6b82706b5..cde5db44abf6 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -450,11 +450,11 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
         port.dev = &dev->dev;
 
         line = serial8250_register_port(&port);
+        if (line < 0)
+                return -ENODEV;
 
-        if (line >= 0)
-                pnp_set_drvdata(dev, (void *)((long)line + 1));
-        return line >= 0 ? 0 : -ENODEV;
-
+        pnp_set_drvdata(dev, (void *)((long)line + 1));
+        return 0;
 }
 
 static void __devexit serial_pnp_remove(struct pnp_dev *dev)