Skip to content

Commit

Permalink
sh: Kill off remaining private runtime PM bits.
Browse files Browse the repository at this point in the history
This kills of the now unused runtime PM stub in favour of the generic
one.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Nov 18, 2011
1 parent 7fa4632 commit 62d3ba8
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 342 deletions.
9 changes: 0 additions & 9 deletions arch/sh/include/asm/device.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@ int platform_resource_setup_memory(struct platform_device *pdev,

void plat_early_device_setup(void);

#define PDEV_ARCHDATA_FLAG_INIT 0
#define PDEV_ARCHDATA_FLAG_IDLE 1
#define PDEV_ARCHDATA_FLAG_SUSP 2

struct pdev_archdata {
int hwblk_id;
#ifdef CONFIG_PM_RUNTIME
unsigned long flags;
struct list_head entry;
struct mutex mutex;
#endif
};
3 changes: 0 additions & 3 deletions arch/sh/kernel/cpu/shmobile/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,3 @@
# Power Management & Sleep mode
obj-$(CONFIG_PM) += pm.o sleep.o
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
ifneq ($(CONFIG_CPU_SUBTYPE_SH7722)$(CONFIG_CPU_SUBTYPE_SH7723)$(CONFIG_CPU_SUBTYPE_SH7724),y)
obj-$(CONFIG_PM_RUNTIME) += pm_runtime.o
endif
319 changes: 0 additions & 319 deletions arch/sh/kernel/cpu/shmobile/pm_runtime.c

This file was deleted.

12 changes: 1 addition & 11 deletions drivers/sh/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,4 @@ obj-$(CONFIG_HAVE_CLK) += clk/
obj-$(CONFIG_MAPLE) += maple/
obj-$(CONFIG_SUPERHYWAY) += superhyway/
obj-$(CONFIG_GENERIC_GPIO) += pfc.o

#
# For the moment we only use this framework for ARM-based SH/R-Mobile
# platforms and generic SH. SH-based SH-Mobile platforms are still using
# an older framework that is pending up-porting, at which point this
# special casing can go away.
#
obj-$(CONFIG_SUPERH)$(CONFIG_ARCH_SHMOBILE) += pm_runtime.o
obj-$(CONFIG_CPU_SUBTYPE_SH7722) += pm_runtime.o
obj-$(CONFIG_CPU_SUBTYPE_SH7723) += pm_runtime.o
obj-$(CONFIG_CPU_SUBTYPE_SH7724) += pm_runtime.o
obj-$(CONFIG_PM_RUNTIME) += pm_runtime.o

0 comments on commit 62d3ba8

Please sign in to comment.