summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-02-14 13:55:53 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-14 13:55:53 +1100
commit9432068a86daa8f3238274466498ba269dd75f0a (patch)
tree7d853e0e0d50035d4f2af1455cdbde8071c86a0b /kernel
parentd30e538f46ec2d23ea8e0a1e95e6a1544e6ae545 (diff)
parent3213f631da786bee317363d251a0cc54b74bc827 (diff)
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts: drivers/acpi/Kconfig drivers/dma/dw_dmac.c drivers/i2c/busses/i2c-s3c2410.c drivers/iommu/tegra-smmu.c drivers/net/ethernet/8390/Kconfig drivers/net/ethernet/fujitsu/Kconfig drivers/net/ethernet/i825xx/Kconfig drivers/net/ethernet/intel/Kconfig drivers/net/ethernet/racal/Kconfig drivers/net/ethernet/seeq/Kconfig drivers/net/wan/Kconfig drivers/spi/Kconfig drivers/spi/spi-s3c64xx.c net/wanrouter/Kconfig
Diffstat (limited to 'kernel')
-rw-r--r--kernel/gcov/Kconfig2
-rw-r--r--kernel/power/suspend_test.c11
2 files changed, 6 insertions, 7 deletions
diff --git a/kernel/gcov/Kconfig b/kernel/gcov/Kconfig
index a92028196cc1..d4da55d1fb65 100644
--- a/kernel/gcov/Kconfig
+++ b/kernel/gcov/Kconfig
@@ -35,7 +35,7 @@ config GCOV_KERNEL
config GCOV_PROFILE_ALL
bool "Profile entire Kernel"
depends on GCOV_KERNEL
- depends on SUPERH || S390 || X86 || (PPC && EXPERIMENTAL) || MICROBLAZE
+ depends on SUPERH || S390 || X86 || PPC || MICROBLAZE
default n
---help---
This options activates profiling for the entire kernel.
diff --git a/kernel/power/suspend_test.c b/kernel/power/suspend_test.c
index 25596e450ac7..9b2a1d58558d 100644
--- a/kernel/power/suspend_test.c
+++ b/kernel/power/suspend_test.c
@@ -112,7 +112,7 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state)
rtc_set_alarm(rtc, &alm);
}
-static int __init has_wakealarm(struct device *dev, void *name_ptr)
+static int __init has_wakealarm(struct device *dev, const void *data)
{
struct rtc_device *candidate = to_rtc_device(dev);
@@ -121,7 +121,6 @@ static int __init has_wakealarm(struct device *dev, void *name_ptr)
if (!device_may_wakeup(candidate->dev.parent))
return 0;
- *(const char **)name_ptr = dev_name(dev);
return 1;
}
@@ -159,8 +158,8 @@ static int __init test_suspend(void)
static char warn_no_rtc[] __initdata =
KERN_WARNING "PM: no wakealarm-capable RTC driver is ready\n";
- char *pony = NULL;
struct rtc_device *rtc = NULL;
+ struct device *dev;
/* PM is initialized by now; is that state testable? */
if (test_state == PM_SUSPEND_ON)
@@ -171,9 +170,9 @@ static int __init test_suspend(void)
}
/* RTCs have initialized by now too ... can we use one? */
- class_find_device(rtc_class, NULL, &pony, has_wakealarm);
- if (pony)
- rtc = rtc_class_open(pony);
+ dev = class_find_device(rtc_class, NULL, NULL, has_wakealarm);
+ if (dev)
+ rtc = rtc_class_open(dev_name(dev));
if (!rtc) {
printk(warn_no_rtc);
goto done;