serial/arc: remove last remanants of platform data

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Vineet Gupta 2014-06-24 13:55:11 +05:30 коммит произвёл Greg Kroah-Hartman
Родитель 2e6fb7cbd0
Коммит 91f1b62a9b
1 изменённых файлов: 6 добавлений и 16 удалений

Просмотреть файл

@ -37,8 +37,8 @@
#include <linux/tty_flip.h> #include <linux/tty_flip.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/of.h> #include <linux/of_irq.h>
#include <linux/of_platform.h> #include <linux/of_address.h>
/************************************* /*************************************
* ARC UART Hardware Specs * ARC UART Hardware Specs
@ -491,11 +491,9 @@ static struct uart_ops arc_serial_pops = {
static int static int
arc_uart_init_one(struct platform_device *pdev, int dev_id) arc_uart_init_one(struct platform_device *pdev, int dev_id)
{ {
struct resource *res, *res2; struct device_node *np = pdev->dev.of_node;
struct arc_uart_port *uart = &arc_uart_ports[dev_id]; struct arc_uart_port *uart = &arc_uart_ports[dev_id];
struct uart_port *port = &uart->port; struct uart_port *port = &uart->port;
struct device_node *np = pdev->dev.of_node;
u32 val; u32 val;
if (of_property_read_u32(np, "clock-frequency", &val)) { if (of_property_read_u32(np, "clock-frequency", &val)) {
@ -510,21 +508,13 @@ arc_uart_init_one(struct platform_device *pdev, int dev_id)
} }
uart->baud = val; uart->baud = val;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); port->membase = of_iomap(np, 0);
if (!res)
return -ENODEV;
res2 = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!res2)
return -ENODEV;
port->mapbase = res->start;
port->membase = ioremap_nocache(res->start, resource_size(res));
if (!port->membase) if (!port->membase)
/* No point of dev_err since UART itself is hosed here */ /* No point of dev_err since UART itself is hosed here */
return -ENXIO; return -ENXIO;
port->irq = res2->start; port->irq = irq_of_parse_and_map(np, 0);
port->dev = &pdev->dev; port->dev = &pdev->dev;
port->iotype = UPIO_MEM; port->iotype = UPIO_MEM;
port->flags = UPF_BOOT_AUTOCONF; port->flags = UPF_BOOT_AUTOCONF;