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

Commit 79ef0716 authored by John Stultz's avatar John Stultz Committed by Greg Kroah-Hartman
Browse files

staging: android-alarm: HACK: wakelock workaround 



Allow Android alarmtimer device to build while wakelocks are still
out of tree.

CC: Arve Hjønnevåg <arve@android.com>
CC: Android Kernel Team <kernel-team@android.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2f28eac

drivers/staging/android/alarm-dev.c

+12 −1
Original line number Diff line number Diff line
@@ -22,13 +22,24 @@ 
#include <linux/sched.h>

#include <linux/spinlock.h>

#include <linux/uaccess.h>

#include <linux/wakelock.h>

#include "android_alarm.h"



/* XXX - Hack out wakelocks, while they are out of tree */

struct wake_lock {

	int i;

};

#define wake_lock(x)

#define wake_lock_timeout(x, y)

#define wake_unlock(x)

#define WAKE_LOCK_SUSPEND 0

#define wake_lock_init(x, y, z) ((x)->i = 1)

#define wake_lock_destroy(x)



#define ANDROID_ALARM_PRINT_INFO (1U << 0)

#define ANDROID_ALARM_PRINT_IO (1U << 1)

#define ANDROID_ALARM_PRINT_INT (1U << 2)





static int debug_mask = ANDROID_ALARM_PRINT_INFO;

module_param_named(debug_mask, debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP);

drivers/staging/android/alarm.c

+11 −1
Original line number Diff line number Diff line
@@ -21,9 +21,19 @@ 
#include <linux/rtc.h>

#include <linux/sched.h>

#include <linux/spinlock.h>

#include <linux/wakelock.h>

#include "android_alarm.h"



/* XXX - Hack out wakelocks, while they are out of tree */

struct wake_lock {

	int i;

};

#define wake_lock(x)

#define wake_lock_timeout(x, y)

#define wake_unlock(x)

#define WAKE_LOCK_SUSPEND 0

#define wake_lock_init(x, y, z) ((x)->i = 1)

#define wake_lock_destroy(x)



#define ANDROID_ALARM_PRINT_ERROR (1U << 0)

#define ANDROID_ALARM_PRINT_INIT_STATUS (1U << 1)

#define ANDROID_ALARM_PRINT_TSET (1U << 2)