unimore/kernel-hacking-2024-linux-steffo
unimore/kernel-hacking-2024-linux-steffo
1
Fork 0
Code Pull requests 5 Wiki Activity

staging: Final semaphore cleanup

Browse source 
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>
This commit is contained in:
Thomas Gleixner 2010-10-30 11:06:57 +02:00
parent 51dfacdef3
commit 45f4d02435
15 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
View file

@ -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++) { for (streamID = HTC_RAW_STREAM_0; streamID < HTC_RAW_STREAM_NUM_MAX; streamID++) {
/* Initialize the data structures */ /* Initialize the data structures */
init_MUTEX(&arRaw->raw_htc_read_sem[streamID]); sema_init(&arRaw->raw_htc_read_sem[streamID], 1);
init_MUTEX(&arRaw->raw_htc_write_sem[streamID]); sema_init(&arRaw->raw_htc_write_sem[streamID], 1);
init_waitqueue_head(&arRaw->raw_htc_read_queue[streamID]); init_waitqueue_head(&arRaw->raw_htc_read_queue[streamID]);
init_waitqueue_head(&arRaw->raw_htc_write_queue[streamID]); init_waitqueue_head(&arRaw->raw_htc_write_queue[streamID]);

4
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View file

@ -1929,7 +1929,7 @@ dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen)
goto fail; goto fail;
net->netdev_ops = NULL; net->netdev_ops = NULL;
init_MUTEX(&dhd->proto_sem); sema_init(&dhd->proto_sem, 1);
/* Initialize other structure content */ /* Initialize other structure content */
init_waitqueue_head(&dhd->ioctl_resp_wait); init_waitqueue_head(&dhd->ioctl_resp_wait);
init_waitqueue_head(&dhd->ctrl_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; dhd->timer.function = dhd_watchdog;
/* Initialize thread based operation and lock */ /* Initialize thread based operation and lock */
init_MUTEX(&dhd->sdsem); sema_init(&dhd->sdsem, 1);
if ((dhd_watchdog_prio >= 0) && (dhd_dpc_prio >= 0)) if ((dhd_watchdog_prio >= 0) && (dhd_dpc_prio >= 0))
dhd->threads_only = true; dhd->threads_only = true;
else else

2
drivers/staging/brcm80211/sys/wl_mac80211.c
View file

@ -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->rpcq_lock);
spin_lock_init(&wl->txq_lock); spin_lock_init(&wl->txq_lock);
init_MUTEX(&wl->sem); sema_init(&wl->sem, 1);
#else #else
spin_lock_init(&wl->lock); spin_lock_init(&wl->lock);
spin_lock_init(&wl->isr_lock); spin_lock_init(&wl->isr_lock);

2
drivers/staging/comedi/drivers/dt9812.c
View file

@ -262,7 +262,7 @@ struct dt9812_usb_cmd {
#define DT9812_NUM_SLOTS 16 #define DT9812_NUM_SLOTS 16
static DECLARE_MUTEX(dt9812_mutex); static DEFINE_SEMAPHORE(dt9812_mutex);
static const struct usb_device_id dt9812_table[] = { static const struct usb_device_id dt9812_table[] = {
{USB_DEVICE(0x0867, 0x9812)}, {USB_DEVICE(0x0867, 0x9812)},

4
drivers/staging/comedi/drivers/usbdux.c
View file

@ -315,7 +315,7 @@ struct usbduxsub {
*/ */
static struct usbduxsub usbduxsub[NUMUSBDUX]; static struct usbduxsub usbduxsub[NUMUSBDUX];
static DECLARE_MUTEX(start_stop_sem); static DEFINE_SEMAPHORE(start_stop_sem);
/* /*
* Stops the data acquision * Stops the data acquision
@ -2367,7 +2367,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
dev_dbg(dev, "comedi_: usbdux: " dev_dbg(dev, "comedi_: usbdux: "
"usbduxsub[%d] is ready to connect to comedi.\n", index); "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 */ /* save a pointer to the usb device */
usbduxsub[index].usbdev = udev; usbduxsub[index].usbdev = udev;

4
drivers/staging/comedi/drivers/usbduxfast.c
View file

@ -199,7 +199,7 @@ struct usbduxfastsub_s {
*/ */
static struct usbduxfastsub_s usbduxfastsub[NUMUSBDUXFAST]; static struct usbduxfastsub_s usbduxfastsub[NUMUSBDUXFAST];
static DECLARE_MUTEX(start_stop_sem); static DEFINE_SEMAPHORE(start_stop_sem);
/* /*
* bulk transfers to usbduxfast * bulk transfers to usbduxfast
@ -1504,7 +1504,7 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
"connect to comedi.\n", index); "connect to comedi.\n", index);
#endif #endif
init_MUTEX(&(usbduxfastsub[index].sem)); sema_init(&(usbduxfastsub[index].sem), 1);
/* save a pointer to the usb device */ /* save a pointer to the usb device */
usbduxfastsub[index].usbdev = udev; usbduxfastsub[index].usbdev = udev;

2
drivers/staging/dream/camera/mt9d112.c
View file

@ -37,7 +37,7 @@ struct mt9d112_ctrl {
static struct mt9d112_ctrl *mt9d112_ctrl; static struct mt9d112_ctrl *mt9d112_ctrl;
static DECLARE_WAIT_QUEUE_HEAD(mt9d112_wait_queue); static DECLARE_WAIT_QUEUE_HEAD(mt9d112_wait_queue);
DECLARE_MUTEX(mt9d112_sem); DEFINE_SEMAPHORE(mt9d112_sem);
/*============================================================= /*=============================================================

2
drivers/staging/dream/camera/mt9p012_fox.c
View file

@ -123,7 +123,7 @@ struct mt9p012_ctrl {
static struct mt9p012_ctrl *mt9p012_ctrl; static struct mt9p012_ctrl *mt9p012_ctrl;
static DECLARE_WAIT_QUEUE_HEAD(mt9p012_wait_queue); static DECLARE_WAIT_QUEUE_HEAD(mt9p012_wait_queue);
DECLARE_MUTEX(mt9p012_sem); DEFINE_SEMAPHORE(mt9p012_sem);
/*============================================================= /*=============================================================
EXTERNAL DECLARATIONS EXTERNAL DECLARATIONS

2
drivers/staging/dream/camera/mt9t013.c
View file

@ -123,7 +123,7 @@ struct mt9t013_ctrl {
static struct mt9t013_ctrl *mt9t013_ctrl; static struct mt9t013_ctrl *mt9t013_ctrl;
static DECLARE_WAIT_QUEUE_HEAD(mt9t013_wait_queue); 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 */ extern struct mt9t013_reg mt9t013_regs; /* from mt9t013_reg.c */

2
drivers/staging/dream/camera/s5k3e2fx.c
View file

@ -313,7 +313,7 @@ struct s5k3e2fx_i2c_reg_conf {
static struct s5k3e2fx_ctrl *s5k3e2fx_ctrl; static struct s5k3e2fx_ctrl *s5k3e2fx_ctrl;
static DECLARE_WAIT_QUEUE_HEAD(s5k3e2fx_wait_queue); 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, static int s5k3e2fx_i2c_rxdata(unsigned short saddr, unsigned char *rxdata,
int length) int length)

4
drivers/staging/msm/msm_fb.c
View file

@ -1158,7 +1158,7 @@ static int msm_fb_release(struct fb_info *info, int user)
return ret; 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, static int msm_fb_pan_display(struct fb_var_screeninfo *var,
struct fb_info *info) struct fb_info *info)
@ -1962,7 +1962,7 @@ static int msmfb_overlay_play(struct fb_info *info, unsigned long *argp)
#endif #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_lut_sem);
DEFINE_MUTEX(msm_fb_ioctl_hist_sem); DEFINE_MUTEX(msm_fb_ioctl_hist_sem);

2
drivers/staging/rtl8712/osdep_service.h
View file

@ -161,7 +161,7 @@ static inline u32 _down_sema(struct semaphore *sema)
static inline void _rtl_rwlock_init(struct semaphore *prwlock) 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) static inline void _init_listhead(struct list_head *list)

2
drivers/staging/smbfs/inode.c
View file

@ -537,7 +537,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
server->mnt = NULL; server->mnt = NULL;
server->sock_file = NULL; server->sock_file = NULL;
init_waitqueue_head(&server->conn_wq); init_waitqueue_head(&server->conn_wq);
init_MUTEX(&server->sem); sema_init(&server->sem, 1);
INIT_LIST_HEAD(&server->entry); INIT_LIST_HEAD(&server->entry);
INIT_LIST_HEAD(&server->xmitq); INIT_LIST_HEAD(&server->xmitq);
INIT_LIST_HEAD(&server->recvq); INIT_LIST_HEAD(&server->recvq);

2
drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
View file

@ -157,7 +157,7 @@ struct cyasblkdev_blk_data {
/* pointer to west bridge block data device superstructure */ /* pointer to west bridge block data device superstructure */
static struct cyasblkdev_blk_data *gl_bd; static struct cyasblkdev_blk_data *gl_bd;
static DECLARE_MUTEX(open_lock); static DEFINE_SEMAPHORE(open_lock);
/* local forwardd declarationss */ /* local forwardd declarationss */
static cy_as_device_handle *cyas_dev_handle; static cy_as_device_handle *cyas_dev_handle;

2
drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c
View file

@ -334,7 +334,7 @@ int cyasblkdev_init_queue(struct cyasblkdev_queue *bq, spinlock_t *lock)
init_completion(&bq->thread_complete); init_completion(&bq->thread_complete);
init_waitqueue_head(&bq->thread_wq); 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); ret = kernel_thread(cyasblkdev_queue_thread, bq, CLONE_KERNEL);
if (ret >= 0) { if (ret >= 0) {