serial: clps711x: Remove board support

Since board support for the CLPS711X platform was removed
(commit 4a56f46a7dc6 ("ARM: clps711x: Remove boards support")),
remove the board support from the driver.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/clps711x.c b/drivers/tty/serial/clps711x.c
index 98f193a..0615907 100644 (file)
--- a/drivers/tty/serial/clps711x.c
+++ b/drivers/tty/serial/clps711x.c
@@ -442,14 +442,10 @@ static struct console clps711x_console = {
 static int uart_clps711x_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
-       int ret, index = np ? of_alias_get_id(np, "serial") : pdev->id;
        struct clps711x_port *s;
        struct resource *res;
        struct clk *uart_clk;
-       int irq;
-
-       if (index < 0 || index >= UART_CLPS711X_NR)
-               return -EINVAL;
+       int irq, ret;
 
        s = devm_kzalloc(&pdev->dev, sizeof(*s), GFP_KERNEL);
        if (!s)
@@ -473,20 +469,11 @@ static int uart_clps711x_probe(struct platform_device *pdev)
        if (s->rx_irq < 0)
                return s->rx_irq;
 
-       if (!np) {
-               char syscon_name[9];
-
-               sprintf(syscon_name, "syscon.%i", index + 1);
-               s->syscon = syscon_regmap_lookup_by_pdevname(syscon_name);
-               if (IS_ERR(s->syscon))
-                       return PTR_ERR(s->syscon);
-       } else {
-               s->syscon = syscon_regmap_lookup_by_phandle(np, "syscon");
-               if (IS_ERR(s->syscon))
-                       return PTR_ERR(s->syscon);
-       }
+       s->syscon = syscon_regmap_lookup_by_phandle(np, "syscon");
+       if (IS_ERR(s->syscon))
+               return PTR_ERR(s->syscon);
 
-       s->port.line            = index;
+       s->port.line            = of_alias_get_id(np, "serial");
        s->port.dev             = &pdev->dev;
        s->port.iotype          = UPIO_MEM32;
        s->port.mapbase         = res->start;