The patch titled
pxafb: convert ctrlr_sem in a mutex
has been added to the -mm tree. Its filename is
pxafb-convert-ctrlr_sem-in-a-mutex.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: pxafb: convert ctrlr_sem in a mutex
From: Matthias Kaehlcke <matthias@xxxxxxxxxxxx>
The semaphore ctrlr_sem is used as a mutex. Convert it to the mutex API.
Signed-off-by: Matthias Kaehlcke <matthias@xxxxxxxxxxxx>
Cc: Daniel Mack <daniel@xxxxxxxx>
Cc: Eric Miao <eric.miao@xxxxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/pxafb.c | 7 ++++---
drivers/video/pxafb.h | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff -puN drivers/video/pxafb.c~pxafb-convert-ctrlr_sem-in-a-mutex drivers/video/pxafb.c
--- a/drivers/video/pxafb.c~pxafb-convert-ctrlr_sem-in-a-mutex
+++ a/drivers/video/pxafb.c
@@ -40,6 +40,7 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/completion.h>
+#include <linux/mutex.h>
#include <linux/kthread.h>
#include <linux/freezer.h>
@@ -1059,7 +1060,7 @@ static void set_ctrlr_state(struct pxafb
{
u_int old_state;
- down(&fbi->ctrlr_sem);
+ mutex_lock(&fbi->ctrlr_lock);
old_state = fbi->state;
@@ -1147,7 +1148,7 @@ static void set_ctrlr_state(struct pxafb
}
break;
}
- up(&fbi->ctrlr_sem);
+ mutex_unlock(&fbi->ctrlr_lock);
}
/*
@@ -1399,7 +1400,7 @@ static struct pxafb_info * __init pxafb_
init_waitqueue_head(&fbi->ctrlr_wait);
INIT_WORK(&fbi->task, pxafb_task);
- init_MUTEX(&fbi->ctrlr_sem);
+ mutex_init(&fbi->ctrlr_lock);
init_completion(&fbi->disable_done);
#ifdef CONFIG_FB_PXA_SMARTPANEL
init_completion(&fbi->command_done);
diff -puN drivers/video/pxafb.h~pxafb-convert-ctrlr_sem-in-a-mutex drivers/video/pxafb.h
--- a/drivers/video/pxafb.h~pxafb-convert-ctrlr_sem-in-a-mutex
+++ a/drivers/video/pxafb.h
@@ -106,7 +106,7 @@ struct pxafb_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;
_
Patches currently in -mm which might be from matthias@xxxxxxxxxxxx are
arm-omap1-n770-convert-audio_pwr_sem-in-a-mutex.patch
arm-omap1-n770-convert-audio_pwr_sem-in-a-mutex-fix.patch
pxafb-convert-ctrlr_sem-in-a-mutex.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
