Skip to content

Commit

Permalink
[ARM] S3C: Rename s3c2410_pm_init to s3c_pm_init.
Browse files Browse the repository at this point in the history
Since we have moved a large proportion of the PM code to the common
support area, remove the cpu specific name from the initialisation
function.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
  • Loading branch information
Ben Dooks committed Mar 8, 2009
1 parent 598ee00 commit 4e59c25
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions Documentation/arm/Samsung-S3C24XX/Suspend.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ Resuming
Machine Support
---------------

The machine specific functions must call the s3c2410_pm_init() function
The machine specific functions must call the s3c_pm_init() function
to say that its bootloader is capable of resuming. This can be as
simple as adding the following to the machine's definition:

INITMACHINE(s3c2410_pm_init)
INITMACHINE(s3c_pm_init)

A board can do its own setup before calling s3c2410_pm_init, if it
A board can do its own setup before calling s3c_pm_init, if it
needs to setup anything else for power management support.

There is currently no support for over-riding the default method of
Expand Down Expand Up @@ -74,7 +74,7 @@ statuc void __init machine_init(void)

enable_irq_wake(IRQ_EINT0);

s3c2410_pm_init();
s3c_pm_init();
}


Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-s3c2410/mach-h1940.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ static void __init h1940_map_io(void)
#ifdef CONFIG_PM_H1940
memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
#endif
s3c2410_pm_init();
s3c_pm_init();
}

static void __init h1940_init_irq(void)
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-s3c2410/mach-qt2410.c
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ static void __init qt2410_machine_init(void)
s3c2410_gpio_cfgpin(S3C2410_GPB5, S3C2410_GPIO_OUTPUT);

platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices));
s3c2410_pm_init();
s3c_pm_init();
}

MACHINE_START(QT2410, "QT2410")
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-s3c2412/mach-jive.c
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ static void __init jive_machine_init(void)

/* initialise the power management now we've setup everything. */

s3c2410_pm_init();
s3c_pm_init();

s3c_device_nand.dev.platform_data = &jive_nand_info;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-s3c2440/mach-rx3715.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ static void __init rx3715_init_machine(void)
#ifdef CONFIG_PM_H1940
memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
#endif
s3c2410_pm_init();
s3c_pm_init();

s3c24xx_fb_set_platdata(&rx3715_fb_info);
platform_add_devices(rx3715_devices, ARRAY_SIZE(rx3715_devices));
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/plat-s3c/include/plat/pm.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
* published by the Free Software Foundation.
*/

/* s3c2410_pm_init
/* s3c_pm_init
*
* called from board at initialisation time to setup the power
* management
*/

#ifdef CONFIG_PM

extern __init int s3c2410_pm_init(void);
extern __init int s3c_pm_init(void);

#else

static inline int s3c2410_pm_init(void)
static inline int s3c_pm_init(void)
{
return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/plat-s3c/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,14 @@ static struct platform_suspend_ops s3c_pm_ops = {
.valid = suspend_valid_only_mem,
};

/* s3c2410_pm_init
/* s3c_pm_init
*
* Attach the power management functions. This should be called
* from the board specific initialisation if the board supports
* it.
*/

int __init s3c2410_pm_init(void)
int __init s3c_pm_init(void)
{
printk("S3C Power Management, Copyright 2004 Simtec Electronics\n");

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/plat-s3c24xx/common-smdk.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,5 +201,5 @@ void __init smdk_machine_init(void)

platform_add_devices(smdk_devs, ARRAY_SIZE(smdk_devs));

s3c2410_pm_init();
s3c_pm_init();
}
2 changes: 1 addition & 1 deletion arch/arm/plat-s3c24xx/pm-simtec.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ static __init int pm_simtec_init(void)

__raw_writel(gstatus4, S3C2410_GSTATUS4);

return s3c2410_pm_init();
return s3c_pm_init();
}

arch_initcall(pm_simtec_init);

0 comments on commit 4e59c25

Please sign in to comment.