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

Commit d1d57524 authored by Mao Jinlong's avatar Mao Jinlong
Browse files

alarmtimer : Fix the issue if CONFIG_RTC_CLASS is not defined 



Some variables should be defined out of "#ifdef CONFIG_RTC_CLASS".
Otherwise error will occur if CONFIG_RTC_CLASS is not defined.

Change-Id: I29397e5a2fc95919668df7ccdff38fb5f7e95012
Signed-off-by: default avatarMao Jinlong <c_jmao@codeaurora.org>
parent c2e38a43

kernel/time/alarmtimer.c

+24 −14
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ static ktime_t freezer_delta; 
static DEFINE_SPINLOCK(freezer_delta_lock);



static struct wakeup_source *ws;

static struct delayed_work work;

static struct workqueue_struct *power_off_alarm_workqueue;



#ifdef CONFIG_RTC_CLASS

/* rtc timer and device for setting alarm wakeups at suspend */
@@ -55,9 +57,7 @@ static struct rtc_timer rtctimer; 
static struct rtc_device	*rtcdev;

static DEFINE_SPINLOCK(rtcdev_lock);

static struct mutex power_on_alarm_lock;

struct delayed_work work;

struct alarm init_alarm;

static struct workqueue_struct *power_off_alarm_workqueue;

static struct alarm init_alarm;



/**

 * power_on_alarm_init - Init power on alarm value
@@ -128,9 +128,9 @@ void set_power_on_alarm(void) 
	getnstimeofday(&wall_time);



	/*

	  alarm_secs have to be bigger than "wall_time +1".

	  It is to make sure that alarm time will be always

	  bigger than wall time.

	 * alarm_secs have to be bigger than "wall_time +1".

	 * It is to make sure that alarm time will be always

	 * bigger than wall time.

	*/

	if (alarm_secs <= wall_time.tv_sec + 1)

		goto disable_alarm;
@@ -159,11 +159,6 @@ exit: 
	mutex_unlock(&power_on_alarm_lock);

}



static void alarm_work_func(struct work_struct *unused)

{

	set_power_on_alarm();

}



static void alarmtimer_triggered_func(void *p)

{

	struct rtc_device *rtc = rtcdev;
@@ -262,8 +257,14 @@ struct rtc_device *alarmtimer_get_rtcdev(void) 
static inline int alarmtimer_rtc_interface_setup(void) { return 0; }

static inline void alarmtimer_rtc_interface_remove(void) { }

static inline void alarmtimer_rtc_timer_init(void) { }

void set_power_on_alarm(void) { }

#endif



static void alarm_work_func(struct work_struct *unused)

{

	set_power_on_alarm();

}



/**

 * alarmtimer_enqueue - Adds an alarm timer to an alarm_base timerqueue

 * @base: pointer to the base where the timer is being run
@@ -1098,15 +1099,24 @@ static int __init alarmtimer_init(void) 
		goto out_drv;

	}

	ws = wakeup_source_register("alarmtimer");

	if (!ws) {

		error = -ENOMEM;

		goto out_ws;

	}



	INIT_DELAYED_WORK(&work, alarm_work_func);

	power_off_alarm_workqueue =

		create_singlethread_workqueue("power_off_alarm");

	if (!power_off_alarm_workqueue)

		return -ENOMEM;

	if (!power_off_alarm_workqueue) {

		error = -ENOMEM;

		goto out_wq;

	}



	return 0;



out_wq:

	wakeup_source_unregister(ws);

out_ws:

	platform_device_unregister(pdev);

out_drv:

	platform_driver_unregister(&alarmtimer_driver);

out_if: