Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 044cf938 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: reset: remove compilation error"

parents bf26d359 30f955d3

drivers/power/reset/msm-poweroff.c

+7 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#define SCM_DLOAD_BOTHDUMPS	(SCM_DLOAD_MINIDUMP | SCM_DLOAD_FULLDUMP)



static int restart_mode;

static void *restart_reason, *dload_type_addr;

static void *restart_reason;

static bool scm_pmic_arbiter_disable_supported;

static bool scm_deassert_ps_hold_supported;

/* Download mode master kill-switch */
@@ -64,7 +64,7 @@ static void scm_disable_sdi(void); 
 * So the SDI cannot be re-enabled when it already by-passed.

 */

static int download_mode = 1;

static struct kobject dload_kobj;

static bool force_warm_reboot;



#ifdef CONFIG_QCOM_DLOAD_MODE

#define EDL_MODE_PROP "qcom,msm-imem-emergency_download_mode"
@@ -74,8 +74,10 @@ static struct kobject dload_kobj; 
#endif



static int in_panic;

static struct kobject dload_kobj;

static int dload_type = SCM_DLOAD_FULLDUMP;

static void *dload_mode_addr;

static void *dload_type_addr;

static bool dload_mode_enabled;

static void *emergency_dload_mode_addr;

#ifdef CONFIG_RANDOMIZE_BASE
@@ -83,8 +85,6 @@ static void *kaslr_imem_addr; 
#endif

static bool scm_dload_supported;



static bool force_warm_reboot;



static int dload_set(const char *val, const struct kernel_param *kp);

/* interface for exporting attributes */

struct reset_attribute {
@@ -416,6 +416,7 @@ static void do_msm_poweroff(void) 
	pr_err("Powering off has failed\n");

}



#ifdef CONFIG_QCOM_DLOAD_MODE

static ssize_t attr_show(struct kobject *kobj, struct attribute *attr,

				char *buf)

{
@@ -533,6 +534,7 @@ static size_t store_dload_mode(struct kobject *kobj, struct attribute *attr, 
}

RESET_ATTR(dload_mode, 0644, show_dload_mode, store_dload_mode);

#endif



RESET_ATTR(emmc_dload, 0644, show_emmc_dload, store_emmc_dload);



static struct attribute *reset_attrs[] = {
@@ -546,6 +548,7 @@ static struct attribute *reset_attrs[] = { 
static struct attribute_group reset_attr_group = {

	.attrs = reset_attrs,

};

#endif



static int msm_restart_probe(struct platform_device *pdev)

{