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

Commit ace9e791 authored by Pavel Machek's avatar Pavel Machek Committed by Greg Kroah-Hartman
Browse files

Staging: dream: remove wakelock support 



Includes changed so that <linux/sched.h> is now needed for
TASK_INTERRUPTIBLE and friends, so include it.

Remove hooks for features not in mainline, such as earlysuspend and
wakelocks.

Signed-off-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 05d42522

drivers/staging/dream/camera/msm_camera.c

+1 −6
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/sched.h>

#include <mach/board.h>



#include <linux/fs.h>
@@ -1597,7 +1598,6 @@ static int __msm_release(struct msm_sync *sync) 
		MSM_DRAIN_QUEUE(sync, pict_frame_q);



		sync->sctrl.s_release();

		wake_unlock(&sync->wake_lock);



		sync->apps_id = NULL;

		CDBG("msm_release completed!\n");
@@ -1806,7 +1806,6 @@ static int __msm_open(struct msm_sync *sync, const char *const apps_id) 
	sync->apps_id = apps_id;



	if (!sync->opencnt) {

		wake_lock(&sync->wake_lock);



		msm_camvfe_fn_init(&sync->vfefn, sync);

		if (sync->vfefn.vfe_init) {
@@ -2044,8 +2043,6 @@ static int msm_sync_init(struct msm_sync *sync, 
	INIT_LIST_HEAD(&sync->pict_frame_q);

	init_waitqueue_head(&sync->pict_frame_wait);



	wake_lock_init(&sync->wake_lock, WAKE_LOCK_IDLE, "msm_camera");



	rc = msm_camio_probe_on(pdev);

	if (rc < 0)

		return rc;
@@ -2058,7 +2055,6 @@ static int msm_sync_init(struct msm_sync *sync, 
	if (rc < 0) {

		pr_err("msm_camera: failed to initialize %s\n",

			sync->sdata->sensor_name);

		wake_lock_destroy(&sync->wake_lock);

		return rc;

	}
@@ -2070,7 +2066,6 @@ static int msm_sync_init(struct msm_sync *sync, 


static int msm_sync_destroy(struct msm_sync *sync)

{

	wake_lock_destroy(&sync->wake_lock);

	return 0;

}

drivers/staging/dream/camera/msm_vfe7x.c

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/msm_adsp.h>

#include <linux/uaccess.h>

#include <linux/fs.h>

#include <linux/sched.h>

#include <linux/android_pmem.h>

#include <mach/msm_adsp.h>

#include <linux/delay.h>

drivers/staging/dream/gpio_event.c

+1 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 *

 */



#include <linux/earlysuspend.h>



#include <linux/module.h>

#include <linux/input.h>

#include <linux/gpio_event.h>
@@ -23,7 +23,6 @@ 
struct gpio_event {

	struct input_dev *input_dev;

	const struct gpio_event_platform_data *info;

	struct early_suspend early_suspend;

	void *state[0];

};

drivers/staging/dream/gpio_input.c

+0 −7
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/hrtimer.h>

#include <linux/input.h>

#include <linux/interrupt.h>

#include <linux/wakelock.h>



enum {

	DEBOUNCE_UNSTABLE     = BIT(0),	/* Got irq, while debouncing */
@@ -44,7 +43,6 @@ struct gpio_input_state { 
	int use_irq;

	int debounce_count;

	spinlock_t irq_lock;

	struct wake_lock wake_lock;

	struct gpio_key_state key_state[0];

};
@@ -143,8 +141,6 @@ static enum hrtimer_restart gpio_event_input_timer_func(struct hrtimer *timer) 
		hrtimer_start(timer, ds->info->debounce_time, HRTIMER_MODE_REL);

	else if (!ds->use_irq)

		hrtimer_start(timer, ds->info->poll_time, HRTIMER_MODE_REL);

	else

		wake_unlock(&ds->wake_lock);



	spin_unlock_irqrestore(&ds->irq_lock, irqflags);
@@ -170,7 +166,6 @@ static irqreturn_t gpio_event_input_irq_handler(int irq, void *dev_id) 
		if (ks->debounce & DEBOUNCE_WAIT_IRQ) {

			ks->debounce = DEBOUNCE_UNKNOWN;

			if (ds->debounce_count++ == 0) {

				wake_lock(&ds->wake_lock);

				hrtimer_start(

					&ds->timer, ds->info->debounce_time,

					HRTIMER_MODE_REL);
@@ -277,7 +272,6 @@ int gpio_event_input_func(struct input_dev *input_dev, 
		ds->debounce_count = di->keymap_size;

		ds->input_dev = input_dev;

		ds->info = di;

		wake_lock_init(&ds->wake_lock, WAKE_LOCK_SUSPEND, "gpio_input");

		spin_lock_init(&ds->irq_lock);



		for (i = 0; i < di->keymap_size; i++) {
@@ -336,7 +330,6 @@ int gpio_event_input_func(struct input_dev *input_dev, 
err_gpio_request_failed:

		;

	}

	wake_lock_destroy(&ds->wake_lock);

	kfree(ds);

err_ds_alloc_failed:

	return ret;

drivers/staging/dream/gpio_matrix.c

+0 −8
Original line number Diff line number Diff line
@@ -18,13 +18,11 @@ 
#include <linux/gpio_event.h>

#include <linux/hrtimer.h>

#include <linux/interrupt.h>

#include <linux/wakelock.h>



struct gpio_kp {

	struct input_dev *input_dev;

	struct gpio_event_matrix_info *keypad_info;

	struct hrtimer timer;

	struct wake_lock wake_lock;

	int current_output;

	unsigned int use_irq:1;

	unsigned int key_state_changed:1;
@@ -199,7 +197,6 @@ static enum hrtimer_restart gpio_keypad_timer_func(struct hrtimer *timer) 
	}

	for (in = 0; in < mi->ninputs; in++)

		enable_irq(gpio_to_irq(mi->input_gpios[in]));

	wake_unlock(&kp->wake_lock);

	return HRTIMER_NORESTART;

}
@@ -222,7 +219,6 @@ static irqreturn_t gpio_keypad_irq_handler(int irq_in, void *dev_id) 
		else

			gpio_direction_input(mi->output_gpios[i]);

	}

	wake_lock(&kp->wake_lock);

	hrtimer_start(&kp->timer, ktime_set(0, 0), HRTIMER_MODE_REL);

	return IRQ_HANDLED;

}
@@ -363,7 +359,6 @@ int gpio_event_matrix_func(struct input_dev *input_dev, 


		hrtimer_init(&kp->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);

		kp->timer.function = gpio_keypad_timer_func;

		wake_lock_init(&kp->wake_lock, WAKE_LOCK_SUSPEND, "gpio_kp");

		err = gpio_keypad_request_irqs(kp);

		kp->use_irq = err == 0;
@@ -371,8 +366,6 @@ int gpio_event_matrix_func(struct input_dev *input_dev, 
			"in %s mode\n", input_dev->name,

			kp->use_irq ? "interrupt" : "polling");



		if (kp->use_irq)

			wake_lock(&kp->wake_lock);

		hrtimer_start(&kp->timer, ktime_set(0, 0), HRTIMER_MODE_REL);



		return 0;
@@ -386,7 +379,6 @@ int gpio_event_matrix_func(struct input_dev *input_dev, 
			free_irq(gpio_to_irq(mi->input_gpios[i]), kp);



	hrtimer_cancel(&kp->timer);

	wake_lock_destroy(&kp->wake_lock);

	for (i = mi->noutputs - 1; i >= 0; i--) {

err_gpio_direction_input_failed:

		gpio_free(mi->input_gpios[i]);