Commit 9b22271d authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds

[PATCH] serial: trivial code flow simplification

Return failure immediately, so we don't have to test it twice.
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 40b36daa
...@@ -450,11 +450,11 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) ...@@ -450,11 +450,11 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
port.dev = &dev->dev; port.dev = &dev->dev;
line = serial8250_register_port(&port); line = serial8250_register_port(&port);
if (line < 0)
return -ENODEV;
if (line >= 0) pnp_set_drvdata(dev, (void *)((long)line + 1));
pnp_set_drvdata(dev, (void *)((long)line + 1)); return 0;
return line >= 0 ? 0 : -ENODEV;
} }
static void __devexit serial_pnp_remove(struct pnp_dev *dev) static void __devexit serial_pnp_remove(struct pnp_dev *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment