Keep history after reset to 1ba84bf0d79d2693dd715db523fd90cd5a4756fa
diff --git a/drivers/mfd/twl6030-poweroff.c b/drivers/mfd/twl6030-poweroff.c
index 9a22c1a..3187806 100644
--- a/drivers/mfd/twl6030-poweroff.c
+++ b/drivers/mfd/twl6030-poweroff.c
@@ -24,12 +24,6 @@
#include <linux/module.h>
#include <linux/pm.h>
#include <linux/i2c/twl.h>
-#include <linux/reboot.h>
-#include <plat/system.h>
-
-#define CONTROLLER_STAT1 0x03
-
-#define VBUS_DET (1<<2)
#define APP_DEVOFF (1<<0)
#define CON_DEVOFF (1<<1)
@@ -39,31 +33,25 @@
{
u8 val = 0;
int err = 0;
- u8 stat1;
- /* if VBUS is present resort to warm reset, reboot reason should already be "off" */
- twl_i2c_read_u8(TWL6030_MODULE_CHARGER, &stat1, CONTROLLER_STAT1);
-
- if (stat1 & VBUS_DET) {
- arch_reset(0, 0);
- } else {
- err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val,
- TWL6030_PHOENIX_DEV_ON);
- if (err) {
- pr_warning("I2C error %d reading PHOENIX_DEV_ON\n", err);
- return;
- }
-
- val |= APP_DEVOFF | CON_DEVOFF | MOD_DEVOFF;
-
- err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, val,
- TWL6030_PHOENIX_DEV_ON);
-
- if (err) {
- pr_warning("I2C error %d writing PHOENIX_DEV_ON\n", err);
- return;
- }
+ err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val,
+ TWL6030_PHOENIX_DEV_ON);
+ if (err) {
+ pr_warning("I2C error %d reading PHOENIX_DEV_ON\n", err);
+ return;
}
+
+ val |= APP_DEVOFF | CON_DEVOFF | MOD_DEVOFF;
+
+ err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, val,
+ TWL6030_PHOENIX_DEV_ON);
+
+ if (err) {
+ pr_warning("I2C error %d writing PHOENIX_DEV_ON\n", err);
+ return;
+ }
+
+ return;
}
static int __init twl6030_poweroff_init(void)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index e1558f6..32a6151 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5432,7 +5432,7 @@
static int perf_swevent_init(struct perf_event *event)
{
- u64 event_id = event->attr.config;
+ int event_id = event->attr.config;
if (event->attr.type != PERF_TYPE_SOFTWARE)
return -ENOENT;
