From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>,
Peter Zijlstra <peterz@infradead.org>,
Christoph Hellwig <hch@infradead.org>,
Greg Kroah-Hartman <gregkh@suse.de>
Subject: [patch 27/30] staging: Bulk convert the semaphore mess
Date: Tue, 07 Sep 2010 14:33:47 -0000 [thread overview]
Message-ID: <20100907125057.278833764@linutronix.de> (raw)
In-Reply-To: 20100907124636.880953480@linutronix.de
[-- Attachment #1: drivers-staging-bulk-sema-fix.patch --]
[-- Type: text/plain, Size: 8878 bytes --]
init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert
staging users.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/staging/comedi/drivers/dt9812.c | 2 +-
drivers/staging/comedi/drivers/usbdux.c | 4 ++--
drivers/staging/comedi/drivers/usbduxfast.c | 4 ++--
drivers/staging/cxt1e1/functions.c | 4 ++--
drivers/staging/dream/pmem.c | 2 +-
drivers/staging/msm/mddihost.c | 2 +-
drivers/staging/msm/mdp.c | 10 +++++-----
drivers/staging/msm/msm_fb.c | 2 +-
drivers/staging/otus/wwrap.c | 2 +-
drivers/staging/rt2860/common/rtmp_init.c | 2 +-
drivers/staging/solo6x10/solo6010-i2c.c | 2 +-
drivers/staging/solo6x10/solo6010-p2m.c | 2 +-
drivers/staging/vme/devices/vme_user.c | 2 +-
13 files changed, 20 insertions(+), 20 deletions(-)
Index: linux-2.6/drivers/staging/comedi/drivers/dt9812.c
===================================================================
--- linux-2.6.orig/drivers/staging/comedi/drivers/dt9812.c
+++ linux-2.6/drivers/staging/comedi/drivers/dt9812.c
@@ -1128,7 +1128,7 @@ static int __init usb_dt9812_init(void)
/* Initialize all driver slots */
for (i = 0; i < DT9812_NUM_SLOTS; i++) {
- init_MUTEX(&dt9812[i].mutex);
+ sema_init(&dt9812[i].mutex, 1);
dt9812[i].serial = 0;
dt9812[i].usb = NULL;
dt9812[i].comedi = NULL;
Index: linux-2.6/drivers/staging/comedi/drivers/usbdux.c
===================================================================
--- linux-2.6.orig/drivers/staging/comedi/drivers/usbdux.c
+++ linux-2.6/drivers/staging/comedi/drivers/usbdux.c
@@ -315,7 +315,7 @@ struct usbduxsub {
*/
static struct usbduxsub usbduxsub[NUMUSBDUX];
-static DECLARE_MUTEX(start_stop_sem);
+static DEFINE_SEMAPHORE(start_stop_sem);
/*
* Stops the data acquision
@@ -2367,7 +2367,7 @@ static int usbduxsub_probe(struct usb_in
dev_dbg(dev, "comedi_: usbdux: "
"usbduxsub[%d] is ready to connect to comedi.\n", index);
- init_MUTEX(&(usbduxsub[index].sem));
+ sema_init(&(usbduxsub[index].sem), 1);
/* save a pointer to the usb device */
usbduxsub[index].usbdev = udev;
Index: linux-2.6/drivers/staging/comedi/drivers/usbduxfast.c
===================================================================
--- linux-2.6.orig/drivers/staging/comedi/drivers/usbduxfast.c
+++ linux-2.6/drivers/staging/comedi/drivers/usbduxfast.c
@@ -199,7 +199,7 @@ struct usbduxfastsub_s {
*/
static struct usbduxfastsub_s usbduxfastsub[NUMUSBDUXFAST];
-static DECLARE_MUTEX(start_stop_sem);
+static DEFINE_SEMAPHORE(start_stop_sem);
/*
* bulk transfers to usbduxfast
@@ -1504,7 +1504,7 @@ static int usbduxfastsub_probe(struct us
"connect to comedi.\n", index);
#endif
- init_MUTEX(&(usbduxfastsub[index].sem));
+ sema_init(&(usbduxfastsub[index].sem), 1);
/* save a pointer to the usb device */
usbduxfastsub[index].usbdev = udev;
Index: linux-2.6/drivers/staging/cxt1e1/functions.c
===================================================================
--- linux-2.6.orig/drivers/staging/cxt1e1/functions.c
+++ linux-2.6/drivers/staging/cxt1e1/functions.c
@@ -184,10 +184,10 @@ OS_sem_init (void *sem, int state)
switch (state)
{
case SEM_TAKEN:
- init_MUTEX_LOCKED ((struct semaphore *) sem);
+ sema_init((struct semaphore *) sem, 0);
break;
case SEM_AVAILABLE:
- init_MUTEX ((struct semaphore *) sem);
+ sema_init((struct semaphore *) sem, 1);
break;
default: /* otherwise, set sem.count to state's
* value */
Index: linux-2.6/drivers/staging/dream/pmem.c
===================================================================
--- linux-2.6.orig/drivers/staging/dream/pmem.c
+++ linux-2.6/drivers/staging/dream/pmem.c
@@ -1231,7 +1231,7 @@ int pmem_setup(struct android_pmem_platf
pmem[id].ioctl = ioctl;
pmem[id].release = release;
init_rwsem(&pmem[id].bitmap_sem);
- init_MUTEX(&pmem[id].data_list_sem);
+ sema_init(&pmem[id].data_list_sem, 1);
INIT_LIST_HEAD(&pmem[id].data_list);
pmem[id].dev.name = pdata->name;
pmem[id].dev.minor = id;
Index: linux-2.6/drivers/staging/msm/mddihost.c
===================================================================
--- linux-2.6.orig/drivers/staging/msm/mddihost.c
+++ linux-2.6/drivers/staging/msm/mddihost.c
@@ -67,7 +67,7 @@ void mddi_init(void)
mddi_host_initialized = TRUE;
- init_MUTEX(&mddi_host_mutex);
+ sema_init(&mddi_host_mutex, 1);
if (!mddi_host_powered) {
down(&mddi_host_mutex);
Index: linux-2.6/drivers/staging/msm/mdp.c
===================================================================
--- linux-2.6.orig/drivers/staging/msm/mdp.c
+++ linux-2.6/drivers/staging/msm/mdp.c
@@ -669,24 +669,24 @@ static void mdp_drv_init(void)
/* initialize semaphore */
init_completion(&mdp_ppp_comp);
- init_MUTEX(&mdp_ppp_mutex);
- init_MUTEX(&mdp_pipe_ctrl_mutex);
+ sema_init(&mdp_ppp_mutex, 1);
+ sema_init(&mdp_pipe_ctrl_mutex, 1);
dma2_data.busy = FALSE;
dma2_data.waiting = FALSE;
init_completion(&dma2_data.comp);
- init_MUTEX(&dma2_data.mutex);
+ sema_init(&dma2_data.mutex, 1);
mutex_init(&dma2_data.ov_mutex);
dma3_data.busy = FALSE;
dma3_data.waiting = FALSE;
init_completion(&dma3_data.comp);
- init_MUTEX(&dma3_data.mutex);
+ sema_init(&dma3_data.mutex, 1);
dma_s_data.busy = FALSE;
dma_s_data.waiting = FALSE;
init_completion(&dma_s_data.comp);
- init_MUTEX(&dma_s_data.mutex);
+ sema_init(&dma_s_data.mutex, 1);
dma_e_data.busy = FALSE;
dma_e_data.waiting = FALSE;
Index: linux-2.6/drivers/staging/msm/msm_fb.c
===================================================================
--- linux-2.6.orig/drivers/staging/msm/msm_fb.c
+++ linux-2.6/drivers/staging/msm/msm_fb.c
@@ -915,7 +915,7 @@ static int msm_fb_register(struct msm_fb
mfd->pan_waiting = FALSE;
init_completion(&mfd->pan_comp);
init_completion(&mfd->refresher_comp);
- init_MUTEX(&mfd->sem);
+ sema_init(&mfd->sem, 1);
fbram_offset = PAGE_ALIGN((int)fbram)-(int)fbram;
fbram += fbram_offset;
Index: linux-2.6/drivers/staging/otus/wwrap.c
===================================================================
--- linux-2.6.orig/drivers/staging/otus/wwrap.c
+++ linux-2.6/drivers/staging/otus/wwrap.c
@@ -985,7 +985,7 @@ u8_t zfLnxCreateThread(zdev_t *dev)
/* Create Mutex and keventd */
INIT_WORK(&macp->kevent, kevent);
- init_MUTEX(&macp->ioctl_sem);
+ sema_init(&macp->ioctl_sem, 1);
return 0;
}
Index: linux-2.6/drivers/staging/rt2860/common/rtmp_init.c
===================================================================
--- linux-2.6.orig/drivers/staging/rt2860/common/rtmp_init.c
+++ linux-2.6/drivers/staging/rt2860/common/rtmp_init.c
@@ -3509,7 +3509,7 @@ int RtmpRaDevCtrlInit(struct rt_rtmp_ada
("STA Driver version-%s\n", STA_DRIVER_VERSION));
#ifdef RTMP_MAC_USB
- init_MUTEX(&(pAd->UsbVendorReq_semaphore));
+ sema_init(&(pAd->UsbVendorReq_semaphore), 1);
os_alloc_mem(pAd, (u8 **) & pAd->UsbVendorReqBuf,
MAX_PARAM_BUFFER_SIZE - 1);
if (pAd->UsbVendorReqBuf == NULL) {
Index: linux-2.6/drivers/staging/solo6x10/solo6010-i2c.c
===================================================================
--- linux-2.6.orig/drivers/staging/solo6x10/solo6010-i2c.c
+++ linux-2.6/drivers/staging/solo6x10/solo6010-i2c.c
@@ -284,7 +284,7 @@ int solo_i2c_init(struct solo6010_dev *s
solo_dev->i2c_id = -1;
solo_dev->i2c_state = IIC_STATE_IDLE;
init_waitqueue_head(&solo_dev->i2c_wait);
- init_MUTEX(&solo_dev->i2c_sem);
+ sema_init(&solo_dev->i2c_sem, 1);
for (i = 0; i < SOLO_I2C_ADAPTERS; i++) {
struct i2c_adapter *adap = &solo_dev->i2c_adap[i];
Index: linux-2.6/drivers/staging/solo6x10/solo6010-p2m.c
===================================================================
--- linux-2.6.orig/drivers/staging/solo6x10/solo6010-p2m.c
+++ linux-2.6/drivers/staging/solo6x10/solo6010-p2m.c
@@ -188,7 +188,7 @@ int solo_p2m_init(struct solo6010_dev *s
for (i = 0; i < SOLO_NR_P2M; i++) {
p2m_dev = &solo_dev->p2m_dev[i];
- init_MUTEX(&p2m_dev->sem);
+ sema_init(&p2m_dev->sem, 1);
init_completion(&p2m_dev->completion);
solo_reg_write(solo_dev, SOLO_P2M_DES_ADR(i),
Index: linux-2.6/drivers/staging/vme/devices/vme_user.c
===================================================================
--- linux-2.6.orig/drivers/staging/vme/devices/vme_user.c
+++ linux-2.6/drivers/staging/vme/devices/vme_user.c
@@ -683,7 +683,7 @@ static int __init vme_user_probe(struct
for (i = 0; i < VME_DEVS; i++) {
image[i].kern_buf = NULL;
image[i].pci_buf = 0;
- init_MUTEX(&(image[i].sem));
+ sema_init(&(image[i].sem), 1);
image[i].device = NULL;
image[i].resource = NULL;
image[i].users = 0;
next prev parent reply other threads:[~2010-09-07 14:34 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-07 14:31 [patch 00/30] semaphore cleanup Thomas Gleixner
2010-09-07 14:31 ` [patch 01/30] semaphore: Add DEFINE_SEMAPHORE Thomas Gleixner
2010-09-07 14:31 ` [patch 02/30] input: misc/hp_sdc_rtc: semaphore cleanup Thomas Gleixner
2010-09-08 15:37 ` Dmitry Torokhov
2010-10-12 15:49 ` [tip:core/locking] input: Misc/hp_sdc_rtc: " tip-bot for Thomas Gleixner
2010-09-07 14:32 ` [patch 03/30] input: serio/hil_mlc: " Thomas Gleixner
2010-10-12 15:49 ` [tip:core/locking] input: Serio/hil_mlc: " tip-bot for Thomas Gleixner
2010-09-07 14:32 ` [patch 04/30] input: serio/hp_sdc: " Thomas Gleixner
2010-10-12 15:49 ` [tip:core/locking] input: Serio/hp_sdc: " tip-bot for Thomas Gleixner
2010-09-07 14:32 ` [patch 05/30] net: 3c527: " Thomas Gleixner
2010-09-07 16:28 ` David Miller
2010-10-12 15:50 ` [tip:core/locking] " tip-bot for Thomas Gleixner
2010-09-07 14:32 ` [patch 06/30] hamradio: 6pack: " Thomas Gleixner
2010-09-07 16:28 ` David Miller
2010-10-12 15:50 ` [tip:core/locking] " tip-bot for Thomas Gleixner
2010-09-07 14:32 ` [patch 07/30] hamradio: mkiss: " Thomas Gleixner
2010-09-07 16:28 ` David Miller
2010-10-12 15:50 ` [tip:core/locking] hamradio: Mkiss: " tip-bot for Thomas Gleixner
2010-09-07 14:32 ` [patch 08/30] net: ppp_async: " Thomas Gleixner
2010-09-07 16:28 ` David Miller
2010-10-12 15:51 ` [tip:core/locking] net: Ppp_async: " tip-bot for Thomas Gleixner
2010-09-07 14:32 ` [patch 09/30] net: wan/cosa.c: Convert "mutex" to semaphore Thomas Gleixner
2010-09-07 16:29 ` David Miller
2010-10-12 15:51 ` [tip:core/locking] net: Wan/cosa.c: " tip-bot for Thomas Gleixner
2010-09-07 14:32 ` [patch 10/30] irda: semaphore cleanup Thomas Gleixner
2010-09-07 16:29 ` David Miller
2010-10-12 15:51 ` [tip:core/locking] irda: Semaphore cleanup tip-bot for Thomas Gleixner
2010-09-07 14:32 ` [patch 11/30] parport: semaphore cleanup Thomas Gleixner
2010-10-12 15:52 ` [tip:core/locking] parport: Semaphore cleanup tip-bot for Thomas Gleixner
2010-09-07 14:32 ` [patch 12/30] ibmphp-hpc: semaphore cleanup Thomas Gleixner
2010-09-09 20:42 ` Jesse Barnes
2010-09-07 14:32 ` [patch 13/30] usb: ftdi-elan: Convert "mutex" to semaphore Thomas Gleixner
2010-09-07 14:32 ` [patch 14/30] scsi: aacraid semaphore cleanup Thomas Gleixner
2010-09-07 14:32 ` [patch 15/30] smbfs: Convert server->sem to mutex Thomas Gleixner
2010-09-10 12:46 ` Jeff Layton
2010-09-07 14:32 ` [patch 16/30] hpfs: Convert sbi->hpfs_creation_de " Thomas Gleixner
2010-10-30 8:16 ` [tip:core/locking] " tip-bot for Thomas Gleixner
2010-09-07 14:33 ` [patch 17/30] hpfsplus: Convert tree_lock " Thomas Gleixner
2010-09-07 14:33 ` [patch 18/30] hfs: " Thomas Gleixner
2010-10-12 15:53 ` [tip:core/locking] " tip-bot for Thomas Gleixner
2010-09-07 14:33 ` [patch 19/30] affs: use sema_init instead of init_MUTEX Thomas Gleixner
2010-10-12 15:54 ` [tip:core/locking] affs: Use " tip-bot for Thomas Gleixner
2010-09-07 14:33 ` [patch 20/30] xfs: semaphore cleanup Thomas Gleixner
2010-09-07 14:33 ` [patch 21/30] mmc: Convert "mutex" to semaphore Thomas Gleixner
2010-09-14 12:47 ` Chris Ball
2010-09-07 14:33 ` [patch 22/30] dvb: " Thomas Gleixner
2010-09-07 14:33 ` [patch 23/30] infiniband: Make user_mad semaphore a real one Thomas Gleixner
2010-09-29 3:53 ` Roland Dreier
2010-09-07 14:33 ` [patch 24/30] ia64: salinfo: sema_init instead of init_MUTEX Thomas Gleixner
2010-09-07 14:33 ` Thomas Gleixner
2010-09-07 14:33 ` [patch 25/30] drivers/macintosh/adb: Do not claim that the semaphore is a mutex Thomas Gleixner
2010-10-12 15:52 ` [tip:core/locking] " tip-bot for Thomas Gleixner
2010-09-07 14:33 ` [patch 26/30] printk: Make console_sem a semaphore not a pseudo mutex Thomas Gleixner
2010-10-12 15:53 ` [tip:core/locking] " tip-bot for Thomas Gleixner
2010-09-07 14:33 ` Thomas Gleixner [this message]
2010-09-08 2:30 ` [patch 27/30] staging: Bulk convert the semaphore mess Greg KH
2010-09-08 8:59 ` Thomas Gleixner
2010-09-08 9:11 ` Greg KH
2010-09-13 18:45 ` Thomas Gleixner
2010-09-08 2:35 ` Greg KH
2010-10-30 10:16 ` [tip:core/locking] staging: Final semaphore cleanup tip-bot for Thomas Gleixner
2010-09-07 14:33 ` [patch 28/30] arm: bcmring: " Thomas Gleixner
2010-09-07 14:33 ` Thomas Gleixner
2010-10-12 15:53 ` [tip:core/locking] arm: Bcmring: " tip-bot for Thomas Gleixner
2010-09-07 14:33 ` [patch 29/30] hwmon: s3c-hwmon: Use a real mutex Thomas Gleixner
2010-09-07 14:33 ` [lm-sensors] " Thomas Gleixner
2010-09-08 13:39 ` Jean Delvare
2010-09-08 13:39 ` [lm-sensors] " Jean Delvare
2010-09-07 14:34 ` [patch 30/30] semaphore: Remove mutex emulation Thomas Gleixner
2010-10-30 10:16 ` [tip:core/locking] " tip-bot for Thomas Gleixner
2010-09-07 15:27 ` [patch 00/30] semaphore cleanup Arnd Bergmann
2010-09-07 15:38 ` Thomas Gleixner
2010-09-07 17:38 ` Arnd Bergmann
2010-09-07 20:23 ` Thomas Gleixner
2010-09-07 20:40 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100907125057.278833764@linutronix.de \
--to=tglx@linutronix.de \
--cc=akpm@linux-foundation.org \
--cc=gregkh@suse.de \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.