From: tip-bot for Thomas Gleixner <tglx@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
gregkh@suse.de, tglx@linutronix.de
Subject: [tip:core/locking] staging: Final semaphore cleanup
Date: Sat, 30 Oct 2010 10:16:15 GMT [thread overview]
Message-ID: <tip-45f4d0243525b6bc747c946937ced437b135a84d@git.kernel.org> (raw)
In-Reply-To: <20100907125057.278833764@linutronix.de>
Commit-ID: 45f4d0243525b6bc747c946937ced437b135a84d
Gitweb: http://git.kernel.org/tip/45f4d0243525b6bc747c946937ced437b135a84d
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Sat, 30 Oct 2010 11:06:57 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sat, 30 Oct 2010 12:12:50 +0200
staging: Final semaphore cleanup
Fixup the last remaining users of DECLARE_MUTEX and init_MUTEX.
Scripted conversion, resulting code is binary equivalent.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
LKML-Reference: <20100907125057.278833764@linutronix.de>
---
drivers/staging/ath6kl/os/linux/ar6000_raw_if.c | 4 ++--
drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 4 ++--
drivers/staging/brcm80211/sys/wl_mac80211.c | 2 +-
drivers/staging/comedi/drivers/dt9812.c | 2 +-
drivers/staging/comedi/drivers/usbdux.c | 4 ++--
drivers/staging/comedi/drivers/usbduxfast.c | 4 ++--
drivers/staging/dream/camera/mt9d112.c | 2 +-
drivers/staging/dream/camera/mt9p012_fox.c | 2 +-
drivers/staging/dream/camera/mt9t013.c | 2 +-
drivers/staging/dream/camera/s5k3e2fx.c | 2 +-
drivers/staging/msm/msm_fb.c | 4 ++--
drivers/staging/rtl8712/osdep_service.h | 2 +-
drivers/staging/smbfs/inode.c | 2 +-
.../westbridge/astoria/block/cyasblkdev_block.c | 2 +-
.../westbridge/astoria/block/cyasblkdev_queue.c | 2 +-
15 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c b/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
index c196098..6b8eeea 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
@@ -198,8 +198,8 @@ int ar6000_htc_raw_open(AR_SOFTC_T *ar)
for (streamID = HTC_RAW_STREAM_0; streamID < HTC_RAW_STREAM_NUM_MAX; streamID++) {
/* Initialize the data structures */
- init_MUTEX(&arRaw->raw_htc_read_sem[streamID]);
- init_MUTEX(&arRaw->raw_htc_write_sem[streamID]);
+ sema_init(&arRaw->raw_htc_read_sem[streamID], 1);
+ sema_init(&arRaw->raw_htc_write_sem[streamID], 1);
init_waitqueue_head(&arRaw->raw_htc_read_queue[streamID]);
init_waitqueue_head(&arRaw->raw_htc_write_queue[streamID]);
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index e535787..bbbe7c5 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1929,7 +1929,7 @@ dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen)
goto fail;
net->netdev_ops = NULL;
- init_MUTEX(&dhd->proto_sem);
+ sema_init(&dhd->proto_sem, 1);
/* Initialize other structure content */
init_waitqueue_head(&dhd->ioctl_resp_wait);
init_waitqueue_head(&dhd->ctrl_wait);
@@ -1977,7 +1977,7 @@ dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen)
dhd->timer.function = dhd_watchdog;
/* Initialize thread based operation and lock */
- init_MUTEX(&dhd->sdsem);
+ sema_init(&dhd->sdsem, 1);
if ((dhd_watchdog_prio >= 0) && (dhd_dpc_prio >= 0))
dhd->threads_only = true;
else
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c
index ad635ee..d060377 100644
--- a/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -866,7 +866,7 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
spin_lock_init(&wl->rpcq_lock);
spin_lock_init(&wl->txq_lock);
- init_MUTEX(&wl->sem);
+ sema_init(&wl->sem, 1);
#else
spin_lock_init(&wl->lock);
spin_lock_init(&wl->isr_lock);
diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c
index 0560a74..0605985 100644
--- a/drivers/staging/comedi/drivers/dt9812.c
+++ b/drivers/staging/comedi/drivers/dt9812.c
@@ -262,7 +262,7 @@ struct dt9812_usb_cmd {
#define DT9812_NUM_SLOTS 16
-static DECLARE_MUTEX(dt9812_mutex);
+static DEFINE_SEMAPHORE(dt9812_mutex);
static const struct usb_device_id dt9812_table[] = {
{USB_DEVICE(0x0867, 0x9812)},
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index 6131e2d..1f177a6 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/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_interface *uinterf,
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;
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 0a164a9..5b15e6d 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/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 usb_interface *uinterf,
"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;
diff --git a/drivers/staging/dream/camera/mt9d112.c b/drivers/staging/dream/camera/mt9d112.c
index e6f2d51..27c978f 100644
--- a/drivers/staging/dream/camera/mt9d112.c
+++ b/drivers/staging/dream/camera/mt9d112.c
@@ -37,7 +37,7 @@ struct mt9d112_ctrl {
static struct mt9d112_ctrl *mt9d112_ctrl;
static DECLARE_WAIT_QUEUE_HEAD(mt9d112_wait_queue);
-DECLARE_MUTEX(mt9d112_sem);
+DEFINE_SEMAPHORE(mt9d112_sem);
/*=============================================================
diff --git a/drivers/staging/dream/camera/mt9p012_fox.c b/drivers/staging/dream/camera/mt9p012_fox.c
index 791bd6c..544a973 100644
--- a/drivers/staging/dream/camera/mt9p012_fox.c
+++ b/drivers/staging/dream/camera/mt9p012_fox.c
@@ -123,7 +123,7 @@ struct mt9p012_ctrl {
static struct mt9p012_ctrl *mt9p012_ctrl;
static DECLARE_WAIT_QUEUE_HEAD(mt9p012_wait_queue);
-DECLARE_MUTEX(mt9p012_sem);
+DEFINE_SEMAPHORE(mt9p012_sem);
/*=============================================================
EXTERNAL DECLARATIONS
diff --git a/drivers/staging/dream/camera/mt9t013.c b/drivers/staging/dream/camera/mt9t013.c
index 8fd7727..75e78aa 100644
--- a/drivers/staging/dream/camera/mt9t013.c
+++ b/drivers/staging/dream/camera/mt9t013.c
@@ -123,7 +123,7 @@ struct mt9t013_ctrl {
static struct mt9t013_ctrl *mt9t013_ctrl;
static DECLARE_WAIT_QUEUE_HEAD(mt9t013_wait_queue);
-DECLARE_MUTEX(mt9t013_sem);
+DEFINE_SEMAPHORE(mt9t013_sem);
extern struct mt9t013_reg mt9t013_regs; /* from mt9t013_reg.c */
diff --git a/drivers/staging/dream/camera/s5k3e2fx.c b/drivers/staging/dream/camera/s5k3e2fx.c
index 1459903..d66b453 100644
--- a/drivers/staging/dream/camera/s5k3e2fx.c
+++ b/drivers/staging/dream/camera/s5k3e2fx.c
@@ -313,7 +313,7 @@ struct s5k3e2fx_i2c_reg_conf {
static struct s5k3e2fx_ctrl *s5k3e2fx_ctrl;
static DECLARE_WAIT_QUEUE_HEAD(s5k3e2fx_wait_queue);
-DECLARE_MUTEX(s5k3e2fx_sem);
+DEFINE_SEMAPHORE(s5k3e2fx_sem);
static int s5k3e2fx_i2c_rxdata(unsigned short saddr, unsigned char *rxdata,
int length)
diff --git a/drivers/staging/msm/msm_fb.c b/drivers/staging/msm/msm_fb.c
index ea268ed..23fa049 100644
--- a/drivers/staging/msm/msm_fb.c
+++ b/drivers/staging/msm/msm_fb.c
@@ -1158,7 +1158,7 @@ static int msm_fb_release(struct fb_info *info, int user)
return ret;
}
-DECLARE_MUTEX(msm_fb_pan_sem);
+DEFINE_SEMAPHORE(msm_fb_pan_sem);
static int msm_fb_pan_display(struct fb_var_screeninfo *var,
struct fb_info *info)
@@ -1962,7 +1962,7 @@ static int msmfb_overlay_play(struct fb_info *info, unsigned long *argp)
#endif
-DECLARE_MUTEX(msm_fb_ioctl_ppp_sem);
+DEFINE_SEMAPHORE(msm_fb_ioctl_ppp_sem);
DEFINE_MUTEX(msm_fb_ioctl_lut_sem);
DEFINE_MUTEX(msm_fb_ioctl_hist_sem);
diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 7fca42c..d1674cd 100644
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -161,7 +161,7 @@ static inline u32 _down_sema(struct semaphore *sema)
static inline void _rtl_rwlock_init(struct semaphore *prwlock)
{
- init_MUTEX(prwlock);
+ sema_init(prwlock, 1);
}
static inline void _init_listhead(struct list_head *list)
diff --git a/drivers/staging/smbfs/inode.c b/drivers/staging/smbfs/inode.c
index 552951a..fa42f40 100644
--- a/drivers/staging/smbfs/inode.c
+++ b/drivers/staging/smbfs/inode.c
@@ -537,7 +537,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
server->mnt = NULL;
server->sock_file = NULL;
init_waitqueue_head(&server->conn_wq);
- init_MUTEX(&server->sem);
+ sema_init(&server->sem, 1);
INIT_LIST_HEAD(&server->entry);
INIT_LIST_HEAD(&server->xmitq);
INIT_LIST_HEAD(&server->recvq);
diff --git a/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c b/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
index f428a7a..e1851f0 100644
--- a/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
+++ b/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
@@ -157,7 +157,7 @@ struct cyasblkdev_blk_data {
/* pointer to west bridge block data device superstructure */
static struct cyasblkdev_blk_data *gl_bd;
-static DECLARE_MUTEX(open_lock);
+static DEFINE_SEMAPHORE(open_lock);
/* local forwardd declarationss */
static cy_as_device_handle *cyas_dev_handle;
diff --git a/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c b/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c
index 24e959e..0bbb8a3 100644
--- a/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c
+++ b/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c
@@ -334,7 +334,7 @@ int cyasblkdev_init_queue(struct cyasblkdev_queue *bq, spinlock_t *lock)
init_completion(&bq->thread_complete);
init_waitqueue_head(&bq->thread_wq);
- init_MUTEX(&bq->thread_sem);
+ sema_init(&bq->thread_sem, 1);
ret = kernel_thread(cyasblkdev_queue_thread, bq, CLONE_KERNEL);
if (ret >= 0) {
next prev parent reply other threads:[~2010-10-30 10:16 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-07 14:31 [patch 00/30] " 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 ` [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 ` [patch 27/30] staging: Bulk convert the semaphore mess Thomas Gleixner
2010-09-08 2:30 ` 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-bot for Thomas Gleixner [this message]
2010-09-07 14:33 ` [patch 28/30] arm: bcmring: semaphore cleanup 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-08 13:39 ` 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=tip-45f4d0243525b6bc747c946937ced437b135a84d@git.kernel.org \
--to=tglx@linutronix.de \
--cc=gregkh@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome