OSDN Git Service

ANDROID: pdev_bus: replace writel with gf_write_ptr
authorRoman Kiryanov <rkir@google.com>
Wed, 7 Mar 2018 01:40:02 +0000 (17:40 -0800)
committerGreg Kroah-Hartman <gregkh@google.com>
Wed, 4 Apr 2018 15:15:40 +0000 (15:15 +0000)
We introduced a function that calls writel inside to simplify 64bit
support.

Bug: 72886167
Change-Id: I987891e0b331a0e205da4bbf4ee98c19edf087b7
Signed-off-by: Roman Kiryanov <rkir@google.com>
drivers/platform/goldfish/pdev_bus.c

index dd9ea46..56ff307 100644 (file)
@@ -130,10 +130,9 @@ static int goldfish_new_pdev(void)
        dev->pdev.dev.dma_mask = (void *)(dev->pdev.name + name_len + 1);
        *dev->pdev.dev.dma_mask = ~0;
 
-#ifdef CONFIG_64BIT
-       writel((u32)((u64)name>>32), pdev_bus_base + PDEV_BUS_GET_NAME_HIGH);
-#endif
-       writel((u32)(unsigned long)name, pdev_bus_base + PDEV_BUS_GET_NAME);
+       gf_write_ptr(name, pdev_bus_base + PDEV_BUS_GET_NAME,
+               pdev_bus_base + PDEV_BUS_GET_NAME_HIGH);
+
        name[name_len] = '\0';
        dev->pdev.id = readl(pdev_bus_base + PDEV_BUS_ID);
        dev->pdev.resource[0].start = base;