diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2007-02-14 00:33:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 08:09:52 -0800 |
| commit | 9b22271d4b8c1be8a81563c322d3f04e7cbe2153 (patch) | |
| tree | 273fb795f79259cc9fb30c1063719e078b3fa88d /drivers/serial | |
| parent | 40b36daad0ac704e6d5c1b75789f371ef5b053c1 (diff) | |
| download | op-kernel-dev-9b22271d4b8c1be8a81563c322d3f04e7cbe2153.zip op-kernel-dev-9b22271d4b8c1be8a81563c322d3f04e7cbe2153.tar.gz | |
[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>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/8250_pnp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c index d3d6b82..cde5db4 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) |
