The patch titled
serial: trivial code flow simplification
has been added to the -mm tree. Its filename is
serial-trivial-code-flow-simplification.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: serial: trivial code flow simplification
From: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Return failure immediately, so we don't have to test it twice.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Cc: Adam Belay <ambx1@xxxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/serial/8250_pnp.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff -puN drivers/serial/8250_pnp.c~serial-trivial-code-flow-simplification drivers/serial/8250_pnp.c
--- a/drivers/serial/8250_pnp.c~serial-trivial-code-flow-simplification
+++ a/drivers/serial/8250_pnp.c
@@ -437,11 +437,11 @@ serial_pnp_probe(struct pnp_dev *dev, co
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)
_
Patches currently in -mm which might be from bjorn.helgaas@xxxxxx are
origin.patch
2.6-sony_acpi4.patch
ia64-note-requirement-for-8250_pnp-now-that-8250_acpi-is-gone.patch
serial-trivial-code-flow-simplification.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
