Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 07:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Third Round of Renesas ARM Based SoC Cleanup for v4.1

Browse Source 
* Remove default cpuidle driver, it does not appear to serve any purpose
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVEgOQAAoJENfPZGlqN0++9GQQAK32yBvDVGxsxs4Sf0+BeXsQ
 qiVoRsqhNIDtHmonGwpQAtpBxLbKiKUgTUXsT3BbX7YOgGwv0QxsiZnP6jsn0CR9
 +cqylFHmSpC14hBfVSl59JKwOOeJ5C46xlnfB0Kf6h/HPBhDR83wPxGMrkAiYKd1
 XsibuWhzDHZT5MpMXCuTzcWSWeC7Ss+BeimmT+5+pU6WzNx2gQGIYJstqcoYXdRH
 ssUzGt83jUYxwAzh9pd4TsPQqqaPteB0t6AoMUWr3K3RAii2TwUTPrfoxfxBWLMS
 mq1im3oH6VZdjc9vzFwlHR54C8/LOEDx3amdyJXPPShb1ZY59Fyk+FsL5GWsb1sO
 ro7WJWBupSUFO+DD0IPMzoR6CZTim//lImbmS6FFd3x1KP8e64NEhPHl1D335eUj
 w2yR/WCKDChxZ2n5eu3kpaIXGIhsevfjeIOJhgClnScgK3IHDNvQGOq0UPhk/YKI
 Ggn13hI1VsV7+leZnt8uWaJ/rQfXfcf6EVmPhrgaPbOMXVThzrQJmPCxs57D4Qj/
 KCcDtDnZTYgfxMsUK4/QzV7Fa+KLTwuLnDd/SZ1cmGDhDbnTMtAxTiTNqE/q4C7+
 Gy1SBlFbarEIv3Ch5/LOkTjHrZQEec9GncxDF2PzAPoFq9XmEqbnUpnMJxqcwaRs
 l68w1O/jQWHNVppl1tau
 =wZzt
 -----END PGP SIGNATURE-----

Merge tag 'renesas-soc-cleanup3-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Merge "Third Round of Renesas ARM Based SoC Cleanup for v4.1" from Simon
Horman:

* Remove default cpuidle driver, it does not appear to serve any purpose

* tag 'renesas-soc-cleanup3-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: cpuidle: Remove the pointless default driver

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-04-03 11:26:08 -07:00
commit 0a47acfa16
4 changed files with 1 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-shmobile/Makefile
View File

@ -46,7 +46,6 @@ smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o
# PM objects
obj-$(CONFIG_SUSPEND) += suspend.o
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
obj-$(CONFIG_PM_RCAR) += pm-rcar.o
obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o

9
arch/arm/mach-shmobile/common.h
View File

@ -23,8 +23,6 @@ struct clk;
extern int shmobile_clk_init(void);
extern void shmobile_handle_irq_intc(struct pt_regs *);
extern struct platform_suspend_ops shmobile_suspend_ops;
struct cpuidle_driver;
extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);
#ifdef CONFIG_SUSPEND
int shmobile_suspend_init(void);
@ -34,12 +32,6 @@ static inline int shmobile_suspend_init(void) { return 0; }
static inline void shmobile_smp_apmu_suspend_init(void) { }
#endif
#ifdef CONFIG_CPU_IDLE
int shmobile_cpuidle_init(void);
#else
static inline int shmobile_cpuidle_init(void) { return 0; }
#endif
#ifdef CONFIG_CPU_FREQ
int shmobile_cpufreq_init(void);
#else
@ -51,7 +43,6 @@ extern void __iomem *shmobile_scu_base;
static inline void __init shmobile_init_late(void)
{
shmobile_suspend_init();
shmobile_cpuidle_init();
shmobile_cpufreq_init();
}

37
arch/arm/mach-shmobile/cpuidle.c
View File

@ -1,37 +0,0 @@
/*
* CPUIdle support code for SH-Mobile ARM
*
* Copyright (C) 2011 Magnus Damm
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/
#include <linux/pm.h>
#include <linux/cpuidle.h>
#include <linux/suspend.h>
#include <linux/module.h>
#include <linux/err.h>
#include <asm/cpuidle.h>
#include <asm/io.h>
static struct cpuidle_driver shmobile_cpuidle_default_driver = {
.name = "shmobile_cpuidle",
.owner = THIS_MODULE,
.states[0] = ARM_CPUIDLE_WFI_STATE,
.safe_state_index = 0, /* C1 */
.state_count = 1,
};
static struct cpuidle_driver *cpuidle_drv = &shmobile_cpuidle_default_driver;
void __init shmobile_cpuidle_set_driver(struct cpuidle_driver *drv)
{
cpuidle_drv = drv;
}
int __init shmobile_cpuidle_init(void)
{
return cpuidle_register(cpuidle_drv, NULL);
}

2
arch/arm/mach-shmobile/pm-sh7372.c
View File

@ -462,7 +462,7 @@ static struct cpuidle_driver sh7372_cpuidle_driver = {
static void __init sh7372_cpuidle_init(void)
{
shmobile_cpuidle_set_driver(&sh7372_cpuidle_driver);
return cpuidle_register(cpuidle_drv, NULL);
}
#else
static void __init sh7372_cpuidle_init(void) {}