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

Commit 7951ac91 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Linus Torvalds
Browse files

sa1100fb: convert ctrlr_sem in a mutex 



The semaphore ctrlr_sem is used as a mutex.  Convert it to the mutex API

Signed-off-by: default avatarMatthias Kaehlcke <matthias@kaehlcke.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b91dbce5

drivers/video/sa1100fb.c

+4 −3
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 
#include <linux/cpufreq.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/mutex.h>



#include <asm/hardware.h>

#include <asm/io.h>
@@ -1108,7 +1109,7 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state) 
{

	u_int old_state;



	down(&fbi->ctrlr_sem);

	mutex_lock(&fbi->ctrlr_lock);



	old_state = fbi->state;
@@ -1193,7 +1194,7 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state) 
		}

		break;

	}

	up(&fbi->ctrlr_sem);

	mutex_unlock(&fbi->ctrlr_lock);

}



/*
@@ -1445,7 +1446,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev) 


	init_waitqueue_head(&fbi->ctrlr_wait);

	INIT_WORK(&fbi->task, sa1100fb_task);

	init_MUTEX(&fbi->ctrlr_sem);

	mutex_init(&fbi->ctrlr_lock);



	return fbi;

}

drivers/video/sa1100fb.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ struct sa1100fb_info { 


	volatile u_char		state;

	volatile u_char		task_state;

	struct semaphore	ctrlr_sem;

	struct mutex		ctrlr_lock;

	wait_queue_head_t	ctrlr_wait;

	struct work_struct	task;