Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static

Conflicts:
	arch/arm/mach-exynos/dma.c
	arch/arm/mach-s5p64x0/dma.c
	arch/arm/mach-s5pc100/dma.c
	arch/arm/mach-s5pv210/dma.c

diff --cc arch/arm/mach-exynos/common.c
Simple merge

diff --cc arch/arm/mach-exynos/dma.c
index 91370de,8dec3db..25f3ef2
--- 1/arch/arm/mach-exynos/dma.c
--- 2/arch/arm/mach-exynos/dma.c
+++ b/arch/arm/mach-exynos/dma.c
@@@ -74,10 -74,23 +74,10 @@@ static struct dma_pl330_platdata exynos
        .peri_id = pdma0_peri,
  };
  
- AMBA_AHB_DEVICE(exynos4_pdma0, "dma-pl330.0", 0x00041330, EXYNOS4_PA_PDMA0,
-       {IRQ_PDMA0}, &exynos4_pdma0_pdata);
 -static struct amba_device exynos4_device_pdma0 = {
 -      .dev = {
 -              .init_name = "dma-pl330.0",
 -              .dma_mask = &dma_dmamask,
 -              .coherent_dma_mask = DMA_BIT_MASK(32),
 -              .platform_data = &exynos4_pdma0_pdata,
 -      },
 -      .res = {
 -              .start = EXYNOS4_PA_PDMA0,
 -              .end = EXYNOS4_PA_PDMA0 + SZ_4K,
 -              .flags = IORESOURCE_MEM,
 -      },
 -      .irq = {IRQ_PDMA0, NO_IRQ},
 -      .periphid = 0x00041330,
 -};
++static AMBA_AHB_DEVICE(exynos4_pdma0, "dma-pl330.0", 0x00041330,
++      EXYNOS4_PA_PDMA0, {IRQ_PDMA0}, &exynos4_pdma0_pdata);
  
- u8 pdma1_peri[] = {
+ static u8 pdma1_peri[] = {
        DMACH_PCM0_RX,
        DMACH_PCM0_TX,
        DMACH_PCM1_RX,
@@@ -110,8 -123,21 +110,8 @@@ static struct dma_pl330_platdata exynos
        .peri_id = pdma1_peri,
  };
  
- AMBA_AHB_DEVICE(exynos4_pdma1,  "dma-pl330.1", 0x00041330, EXYNOS4_PA_PDMA1,
-       {IRQ_PDMA1}, &exynos4_pdma1_pdata);
 -static struct amba_device exynos4_device_pdma1 = {
 -      .dev = {
 -              .init_name = "dma-pl330.1",
 -              .dma_mask = &dma_dmamask,
 -              .coherent_dma_mask = DMA_BIT_MASK(32),
 -              .platform_data = &exynos4_pdma1_pdata,
 -      },
 -      .res = {
 -              .start = EXYNOS4_PA_PDMA1,
 -              .end = EXYNOS4_PA_PDMA1 + SZ_4K,
 -              .flags = IORESOURCE_MEM,
 -      },
 -      .irq = {IRQ_PDMA1, NO_IRQ},
 -      .periphid = 0x00041330,
 -};
++static AMBA_AHB_DEVICE(exynos4_pdma1,  "dma-pl330.1", 0x00041330,
++      EXYNOS4_PA_PDMA1, {IRQ_PDMA1}, &exynos4_pdma1_pdata);
  
  static int __init exynos4_dma_init(void)
  {

diff --cc arch/arm/mach-s5p64x0/dma.c
index f7f68ad,8fce116..2ee5dc0
--- 1/arch/arm/mach-s5p64x0/dma.c
--- 2/arch/arm/mach-s5p64x0/dma.c
+++ b/arch/arm/mach-s5p64x0/dma.c
@@@ -108,8 -108,20 +108,8 @@@ static struct dma_pl330_platdata s5p645
        .peri_id = s5p6450_pdma_peri,
  };
  
- AMBA_AHB_DEVICE(s5p64x0_pdma, "dma-pl330", 0x00041330, S5P64X0_PA_PDMA,
-       {IRQ_DMA0}, NULL);
 -static struct amba_device s5p64x0_device_pdma = {
 -      .dev = {
 -              .init_name = "dma-pl330",
 -              .dma_mask = &dma_dmamask,
 -              .coherent_dma_mask = DMA_BIT_MASK(32),
 -      },
 -      .res = {
 -              .start = S5P64X0_PA_PDMA,
 -              .end = S5P64X0_PA_PDMA + SZ_4K,
 -              .flags = IORESOURCE_MEM,
 -      },
 -      .irq = {IRQ_DMA0, NO_IRQ},
 -      .periphid = 0x00041330,
 -};
++static AMBA_AHB_DEVICE(s5p64x0_pdma, "dma-pl330", 0x00041330,
++      S5P64X0_PA_PDMA, {IRQ_DMA0}, NULL);
  
  static int __init s5p64x0_dma_init(void)
  {

diff --cc arch/arm/mach-s5pc100/dma.c
index 96b1ab3,395e46b..afd8db2
--- 1/arch/arm/mach-s5pc100/dma.c
--- 2/arch/arm/mach-s5pc100/dma.c
+++ b/arch/arm/mach-s5pc100/dma.c
@@@ -73,10 -73,23 +73,10 @@@ static struct dma_pl330_platdata s5pc10
        .peri_id = pdma0_peri,
  };
  
- AMBA_AHB_DEVICE(s5pc100_pdma0,  "dma-pl330.0", 0x00041330, S5PC100_PA_PDMA0,
-       {IRQ_PDMA0}, &s5pc100_pdma0_pdata);
 -static struct amba_device s5pc100_device_pdma0 = {
 -      .dev = {
 -              .init_name = "dma-pl330.0",
 -              .dma_mask = &dma_dmamask,
 -              .coherent_dma_mask = DMA_BIT_MASK(32),
 -              .platform_data = &s5pc100_pdma0_pdata,
 -      },
 -      .res = {
 -              .start = S5PC100_PA_PDMA0,
 -              .end = S5PC100_PA_PDMA0 + SZ_4K,
 -              .flags = IORESOURCE_MEM,
 -      },
 -      .irq = {IRQ_PDMA0, NO_IRQ},
 -      .periphid = 0x00041330,
 -};
++static AMBA_AHB_DEVICE(s5pc100_pdma0,  "dma-pl330.0", 0x00041330,
++      S5PC100_PA_PDMA0, {IRQ_PDMA0}, &s5pc100_pdma0_pdata);
  
- u8 pdma1_peri[] = {
+ static u8 pdma1_peri[] = {
        DMACH_UART0_RX,
        DMACH_UART0_TX,
        DMACH_UART1_RX,
@@@ -114,8 -127,21 +114,8 @@@ static struct dma_pl330_platdata s5pc10
        .peri_id = pdma1_peri,
  };
  
- AMBA_AHB_DEVICE(s5pc100_pdma1, "dma-pl330.1", 0x00041330, S5PC100_PA_PDMA1,
-       {IRQ_PDMA1}, &s5pc100_pdma1_pdata);
 -static struct amba_device s5pc100_device_pdma1 = {
 -      .dev = {
 -              .init_name = "dma-pl330.1",
 -              .dma_mask = &dma_dmamask,
 -              .coherent_dma_mask = DMA_BIT_MASK(32),
 -              .platform_data = &s5pc100_pdma1_pdata,
 -      },
 -      .res = {
 -              .start = S5PC100_PA_PDMA1,
 -              .end = S5PC100_PA_PDMA1 + SZ_4K,
 -              .flags = IORESOURCE_MEM,
 -      },
 -      .irq = {IRQ_PDMA1, NO_IRQ},
 -      .periphid = 0x00041330,
 -};
++static AMBA_AHB_DEVICE(s5pc100_pdma1, "dma-pl330.1", 0x00041330,
++      S5PC100_PA_PDMA1, {IRQ_PDMA1}, &s5pc100_pdma1_pdata);
  
  static int __init s5pc100_dma_init(void)
  {

diff --cc arch/arm/mach-s5pv210/dma.c
index f6885d2,fc1be6e..86ce62f
--- 1/arch/arm/mach-s5pv210/dma.c
--- 2/arch/arm/mach-s5pv210/dma.c
+++ b/arch/arm/mach-s5pv210/dma.c
@@@ -71,10 -71,23 +71,10 @@@ static struct dma_pl330_platdata s5pv21
        .peri_id = pdma0_peri,
  };
  
- AMBA_AHB_DEVICE(s5pv210_pdma0, "dma-pl330.0", 0x00041330, S5PV210_PA_PDMA0,
-       {IRQ_PDMA0}, &s5pv210_pdma0_pdata);
 -static struct amba_device s5pv210_device_pdma0 = {
 -      .dev = {
 -              .init_name = "dma-pl330.0",
 -              .dma_mask = &dma_dmamask,
 -              .coherent_dma_mask = DMA_BIT_MASK(32),
 -              .platform_data = &s5pv210_pdma0_pdata,
 -      },
 -      .res = {
 -              .start = S5PV210_PA_PDMA0,
 -              .end = S5PV210_PA_PDMA0 + SZ_4K,
 -              .flags = IORESOURCE_MEM,
 -      },
 -      .irq = {IRQ_PDMA0, NO_IRQ},
 -      .periphid = 0x00041330,
 -};
++static AMBA_AHB_DEVICE(s5pv210_pdma0, "dma-pl330.0", 0x00041330,
++      S5PV210_PA_PDMA0, {IRQ_PDMA0}, &s5pv210_pdma0_pdata);
  
- u8 pdma1_peri[] = {
+ static u8 pdma1_peri[] = {
        DMACH_UART0_RX,
        DMACH_UART0_TX,
        DMACH_UART1_RX,
@@@ -114,8 -127,21 +114,8 @@@ static struct dma_pl330_platdata s5pv21
        .peri_id = pdma1_peri,
  };
  
- AMBA_AHB_DEVICE(s5pv210_pdma1, "dma-pl330.1", 0x00041330, S5PV210_PA_PDMA1,
-       {IRQ_PDMA1}, &s5pv210_pdma1_pdata);
 -static struct amba_device s5pv210_device_pdma1 = {
 -      .dev = {
 -              .init_name = "dma-pl330.1",
 -              .dma_mask = &dma_dmamask,
 -              .coherent_dma_mask = DMA_BIT_MASK(32),
 -              .platform_data = &s5pv210_pdma1_pdata,
 -      },
 -      .res = {
 -              .start = S5PV210_PA_PDMA1,
 -              .end = S5PV210_PA_PDMA1 + SZ_4K,
 -              .flags = IORESOURCE_MEM,
 -      },
 -      .irq = {IRQ_PDMA1, NO_IRQ},
 -      .periphid = 0x00041330,
 -};
++static AMBA_AHB_DEVICE(s5pv210_pdma1, "dma-pl330.1", 0x00041330,
++      S5PV210_PA_PDMA1, {IRQ_PDMA1}, &s5pv210_pdma1_pdata);
  
  static int __init s5pv210_dma_init(void)
  {