tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

msm_serial: Use relative resources for iomem

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>

David Brown 886a451b c6a389f1

+6 -10
+6 -10
drivers/tty/serial/msm_serial.c
··· 589 589 iowrite32(GSBI_PROTOCOL_IDLE, msm_port->gsbi_base + 590 590 GSBI_CONTROL); 591 591 592 - gsbi_resource = platform_get_resource_byname(pdev, 593 - IORESOURCE_MEM, 594 - "gsbi_resource"); 592 + gsbi_resource = platform_get_resource(pdev, 593 + IORESOURCE_MEM, 1); 595 594 596 595 if (unlikely(!gsbi_resource)) 597 596 return; ··· 611 612 resource_size_t size; 612 613 int ret; 613 614 614 - uart_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, 615 - "uart_resource"); 615 + uart_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0); 616 616 if (unlikely(!uart_resource)) 617 617 return -ENXIO; 618 618 ··· 626 628 goto fail_release_port; 627 629 } 628 630 629 - gsbi_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, 630 - "gsbi_resource"); 631 + gsbi_resource = platform_get_resource(pdev, IORESOURCE_MEM, 1); 631 632 /* Is this a GSBI-based port? */ 632 633 if (gsbi_resource) { 633 634 size = resource_size(gsbi_resource); ··· 872 875 port->dev = &pdev->dev; 873 876 msm_port = UART_TO_MSM(port); 874 877 875 - if (platform_get_resource_byname(pdev, IORESOURCE_MEM, "gsbi_resource")) 878 + if (platform_get_resource(pdev, IORESOURCE_MEM, 1)) 876 879 msm_port->is_uartdm = 1; 877 880 else 878 881 msm_port->is_uartdm = 0; ··· 896 899 printk(KERN_INFO "uartclk = %d\n", port->uartclk); 897 900 898 901 899 - resource = platform_get_resource_byname(pdev, IORESOURCE_MEM, 900 - "uart_resource"); 902 + resource = platform_get_resource(pdev, IORESOURCE_MEM, 0); 901 903 if (unlikely(!resource)) 902 904 return -ENXIO; 903 905 port->mapbase = resource->start;