Skip to content

Commit

Permalink
msm_serial: Use relative resources for iomem
Browse files Browse the repository at this point in the history
Device tree iomem resources are only accessible by index, and not by
name.  The msm_serial devices always have either 1 or 2 iomem
resources, that are always in the same order.  Convert the
platform_get_resource_byname into just platform_get_resource to
facilitate device tree conversion.

Change-Id: I4fd0f1037e07f2725a2a25c7b07dea2ca9397db7
Signed-off-by: David Brown <davidb@codeaurora.org>
  • Loading branch information
David Brown committed Aug 29, 2011
1 parent c6a389f commit 886a451
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions drivers/tty/serial/msm_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -589,9 +589,8 @@ static void msm_release_port(struct uart_port *port)
iowrite32(GSBI_PROTOCOL_IDLE, msm_port->gsbi_base +
GSBI_CONTROL);

gsbi_resource = platform_get_resource_byname(pdev,
IORESOURCE_MEM,
"gsbi_resource");
gsbi_resource = platform_get_resource(pdev,
IORESOURCE_MEM, 1);

if (unlikely(!gsbi_resource))
return;
Expand All @@ -612,8 +611,7 @@ static int msm_request_port(struct uart_port *port)
resource_size_t size;
int ret;

uart_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"uart_resource");
uart_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (unlikely(!uart_resource))
return -ENXIO;

Expand All @@ -628,8 +626,7 @@ static int msm_request_port(struct uart_port *port)
goto fail_release_port;
}

gsbi_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"gsbi_resource");
gsbi_resource = platform_get_resource(pdev, IORESOURCE_MEM, 1);
/* Is this a GSBI-based port? */
if (gsbi_resource) {
size = resource_size(gsbi_resource);
Expand Down Expand Up @@ -875,7 +872,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
port->dev = &pdev->dev;
msm_port = UART_TO_MSM(port);

if (platform_get_resource_byname(pdev, IORESOURCE_MEM, "gsbi_resource"))
if (platform_get_resource(pdev, IORESOURCE_MEM, 1))
msm_port->is_uartdm = 1;
else
msm_port->is_uartdm = 0;
Expand All @@ -899,8 +896,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
printk(KERN_INFO "uartclk = %d\n", port->uartclk);


resource = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"uart_resource");
resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (unlikely(!resource))
return -ENXIO;
port->mapbase = resource->start;
Expand Down

0 comments on commit 886a451

Please sign in to comment.