diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2015-02-16 09:27:49 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-07 05:06:51 +0300 |
| commit | 045f32dda9477d3ddf31a4fa862c487d0f747e33 (patch) | |
| tree | 37211a068d39bb3fc4063aeae43117fc7d60a569 /drivers/tty | |
| parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) | |
| download | linux-045f32dda9477d3ddf31a4fa862c487d0f747e33.tar.xz | |
Revert "tty/serial: of_serial: add DT alias ID handling"
This reverts commit 6d01bb9dc82a60580f749062a48cb47cd5caca07.
The exact same code was added in commit 3239fd31d4 (serial: of-serial: fetch
line number from DT) a few lined above. Doing this once should be enough.
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/of_serial.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 7ff61e24a195..33fb94f78967 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c @@ -133,10 +133,6 @@ static int of_platform_serial_setup(struct platform_device *ofdev, if (of_find_property(np, "no-loopback-test", NULL)) port->flags |= UPF_SKIP_TEST; - ret = of_alias_get_id(np, "serial"); - if (ret >= 0) - port->line = ret; - port->dev = &ofdev->dev; switch (type) { |