Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62f38343 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/cleanup-use-static' of... 

Merge branch 'next/cleanup-use-static' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

* 'next/cleanup-use-static' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: use static declaration when it is not used in other files
  ARM: S5PV210: use static declaration when it is not used in other files
  ARM: S5PC100: use static declaration when it is not used in other files
  ARM: S5P64X0: use static declaration when it is not used in other files
  ARM: S3C64XX: use static declaration when it is not used in other files
  ARM: S3C24XX: use static declaration when it is not used in other files
  ARM: EXYNOS: use static declaration when it is not used in other files
parents 4d02be5a 60571f98

arch/arm/mach-exynos/clock-exynos4210.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static void exynos4210_clock_resume(void) 
#define exynos4210_clock_resume NULL

#endif



struct syscore_ops exynos4210_clock_syscore_ops = {

static struct syscore_ops exynos4210_clock_syscore_ops = {

	.suspend	= exynos4210_clock_suspend,

	.resume		= exynos4210_clock_resume,

};

arch/arm/mach-exynos/clock-exynos4212.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static void exynos4212_clock_resume(void) 
#define exynos4212_clock_resume NULL

#endif



struct syscore_ops exynos4212_clock_syscore_ops = {

static struct syscore_ops exynos4212_clock_syscore_ops = {

	.suspend	= exynos4212_clock_suspend,

	.resume		= exynos4212_clock_resume,

};

arch/arm/mach-exynos/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -1526,7 +1526,7 @@ static void exynos4_clock_resume(void) 
#define exynos4_clock_resume NULL

#endif



struct syscore_ops exynos4_clock_syscore_ops = {

static struct syscore_ops exynos4_clock_syscore_ops = {

	.suspend	= exynos4_clock_suspend,

	.resume		= exynos4_clock_resume,

};

arch/arm/mach-exynos/common.c

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ static void exynos4_irq_eint0_15(unsigned int irq, struct irq_desc *desc) 
	chained_irq_exit(chip, desc);

}



int __init exynos4_init_irq_eint(void)

static int __init exynos4_init_irq_eint(void)

{

	int irq;

arch/arm/mach-exynos/dma.c

+8 −8
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


static u64 dma_dmamask = DMA_BIT_MASK(32);



u8 pdma0_peri[] = {

static u8 pdma0_peri[] = {

	DMACH_PCM0_RX,

	DMACH_PCM0_TX,

	DMACH_PCM2_RX,
@@ -69,15 +69,15 @@ u8 pdma0_peri[] = { 
	DMACH_AC97_PCMOUT,

};



struct dma_pl330_platdata exynos4_pdma0_pdata = {

static struct dma_pl330_platdata exynos4_pdma0_pdata = {

	.nr_valid_peri = ARRAY_SIZE(pdma0_peri),

	.peri_id = pdma0_peri,

};



AMBA_AHB_DEVICE(exynos4_pdma0, "dma-pl330.0", 0x00041330, EXYNOS4_PA_PDMA0,

	{IRQ_PDMA0}, &exynos4_pdma0_pdata);

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,
@@ -105,13 +105,13 @@ u8 pdma1_peri[] = { 
	DMACH_SLIMBUS5_TX,

};



struct dma_pl330_platdata exynos4_pdma1_pdata = {

static struct dma_pl330_platdata exynos4_pdma1_pdata = {

	.nr_valid_peri = ARRAY_SIZE(pdma1_peri),

	.peri_id = pdma1_peri,

};



AMBA_AHB_DEVICE(exynos4_pdma1,  "dma-pl330.1", 0x00041330, EXYNOS4_PA_PDMA1,

	{IRQ_PDMA1}, &exynos4_pdma1_pdata);

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)

{