* - serial-trivial-code-flow-simplification.patch removed from -mm tree
@ 2007-02-15 8:47 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2007-02-15 8:47 UTC (permalink / raw)
To: bjorn.helgaas, ambx1, rmk, mm-commits
The patch titled
serial: trivial code flow simplification
has been removed from the -mm tree. Its filename was
serial-trivial-code-flow-simplification.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: serial: trivial code flow simplification
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
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>
---
drivers/serial/8250_pnp.c | 8 ++++----
1 file 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
@@ -450,11 +450,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@hp.com are
origin.patch
git-acpi.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-02-15 8:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-15 8:47 - serial-trivial-code-flow-simplification.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.