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

Commit d38688a6 authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Consolidate PM debug functions 



This patch removes one-line functions that was used just to pass
constant arguments to lower level functions. After previous patches the
need for those constants has been eliminated, so the main functions can
be called directly.

Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 99b2fc2b

arch/arm/plat-samsung/pm.c

+6 −14
Original line number Diff line number Diff line
@@ -85,9 +85,10 @@ static inline void __iomem *s3c_pm_uart_base(void) 
	return (void __iomem *)vaddr;

}



static void s3c_pm_save_uart(unsigned int uart, struct pm_uart_save *save)

static void s3c_pm_save_uarts(void)

{

	void __iomem *regs = s3c_pm_uart_base();

	struct pm_uart_save *save = &uart_save;



	save->ulcon = __raw_readl(regs + S3C2410_ULCON);

	save->ucon = __raw_readl(regs + S3C2410_UCON);
@@ -98,18 +99,14 @@ static void s3c_pm_save_uart(unsigned int uart, struct pm_uart_save *save) 
	if (!soc_is_s3c2410())

		save->udivslot = __raw_readl(regs + S3C2443_DIVSLOT);



	S3C_PMDBG("UART[%d]: ULCON=%04x, UCON=%04x, UFCON=%04x, UBRDIV=%04x\n",

		  uart, save->ulcon, save->ucon, save->ufcon, save->ubrdiv);

}



static void s3c_pm_save_uarts(void)

{

	s3c_pm_save_uart(CONFIG_DEBUG_S3C_UART, &uart_save);

	S3C_PMDBG("UART[%p]: ULCON=%04x, UCON=%04x, UFCON=%04x, UBRDIV=%04x\n",

		  regs, save->ulcon, save->ucon, save->ufcon, save->ubrdiv);

}



static void s3c_pm_restore_uart(unsigned int uart, struct pm_uart_save *save)

static void s3c_pm_restore_uarts(void)

{

	void __iomem *regs = s3c_pm_uart_base();

	struct pm_uart_save *save = &uart_save;



	s3c_pm_arch_update_uart(regs, save);
@@ -122,11 +119,6 @@ static void s3c_pm_restore_uart(unsigned int uart, struct pm_uart_save *save) 
	if (!soc_is_s3c2410())

		__raw_writel(save->udivslot, regs + S3C2443_DIVSLOT);

}



static void s3c_pm_restore_uarts(void)

{

	s3c_pm_restore_uart(CONFIG_DEBUG_S3C_UART, &uart_save);

}

#else

#define s3c_pm_debug_init() do { } while (0)