Staging: Convert the semaphore mess

Thomas / Ingo / Greg

I started with the patch in -rt 041e3130496f31d0cb4887fc6183117e662f5141 and tried to forward port it to 2.6.33-rc3

The patch no-longer applied, because some of the changes were already accepted upstream, some files had been moved or dropped and so on.

So, I broke the original patch into one patch per file, and fixed merge errors. Then I also went and changed similar problems in new code

This code should be queued-up for the 2.6.34 merge window, and should also be applied to the latests -rt branch.

John Kacur (6):
mt9d112: Convert the semaphore mess.
mt9p012_fox: Convert the semaphore mess
mt9t013: Convert the semaphore mess
s5k3e2fx: Convert the semaphore mess
pmem: Convert the semaphore mess.
vme_user: Convert the semaphore mess

Thomas Gleixner (9):
dt9812: Convert the semaphore mess
usbdux.c: Convert the semaphore mess
usbduxfast: Convert the semaphore mess
alphatrack: Convert the semaphore mess
tranzport: Convert he semaphore mess
mimio: Convert semaphore mess
wwrap: Convert the semaphore mess
p9auth: Convert the semaphore mess
rtmp_init: Convert the semaphore mess.

 drivers/staging/comedi/drivers/dt9812.c     |    4 ++--
 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/dream/pmem.c                |    2 +-
 drivers/staging/frontier/alphatrack.c       |    2 +-
 drivers/staging/frontier/tranzport.c        |    4 ++--
 drivers/staging/mimio/mimio.c               |    2 +-
 drivers/staging/otus/wwrap.c                |    2 +-
 drivers/staging/p9auth/p9auth.c             |    2 +-
 drivers/staging/rt2860/common/rtmp_init.c   |    2 +-
 drivers/staging/vme/devices/vme_user.c      |    2 +-
 15 files changed, 19 insertions(+), 19 deletions(-)

From: Thomas Gleixner <[email protected]>

From: Thomas Gleixner <[email protected]>
Date: Sun, 26 Jul 2009 00:59:33 +0200
Subject: [PATCH 124/570] staging: Bulk convert the semaphore mess

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert staging users.

I have broken the original patch down into separate patches per file, because the original patch no longer applies.

---
 drivers/staging/comedi/drivers/dt9812.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

index 312f4f2..91a0c5d 100644
@@ -262,7 +262,7 @@ struct dt9812_usb_cmd {
 
 #define DT9812_NUM_SLOTS	16
 
-static DECLARE_MUTEX(dt9812_mutex);
+static DEFINE_SEMAPHORE(dt9812_mutex);
 
 static struct usb_device_id dt9812_table[] = {
 	{USB_DEVICE(0x0867, 0x9812)},

@@ -1124,7 +1124,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);
+		semaphore_init(&dt9812[i].mutex);
 		dt9812[i].serial = 0;
 		dt9812[i].usb = NULL;
 		dt9812[i].comedi = NULL;

1.6.5.2

From: Thomas Gleixner <[email protected]>

From: Thomas Gleixner <[email protected]>
Date: Sun, 26 Jul 2009 00:59:33 +0200
Subject: [PATCH 124/570] staging: Bulk convert the semaphore mess

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert staging users.

I have broken the original patch down into separate patches per file because theoriginal patch no longer applies.

---
 drivers/staging/comedi/drivers/usbdux.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

index 9a1b559..33628b9 100644
@@ -316,7 +316,7 @@ struct usbduxsub {
  */
 static struct usbduxsub usbduxsub[NUMUSBDUX];
 
-static DECLARE_MUTEX(start_stop_sem);
+static DEFINE_SEMAPHORE(start_stop_sem);
 
 /*
  * Stops the data acquision

@@ -2370,7 +2370,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));
+	semaphore_init(&(usbduxsub[index].sem));
 	/* save a pointer to the usb device */
 	usbduxsub[index].usbdev = udev;
 

1.6.5.2

From: Thomas Gleixner <[email protected]>

From: Thomas Gleixner <[email protected]>
Date: Sun, 26 Jul 2009 00:59:33 +0200
Subject: [PATCH 124/570] staging: Bulk convert the semaphore mess

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert staging users.

I have broken the original patch down into separate patches per file because the original patch no longer applies.

---
 drivers/staging/comedi/drivers/usbduxfast.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

index 2e675cc..d3671e0 100644
@@ -200,7 +200,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

@@ -1500,7 +1500,7 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
 	       "connect to comedi.\n", index);
 #endif
 
-	init_MUTEX(&(usbduxfastsub[index].sem));
+	semaphore_init(&(usbduxfastsub[index].sem));
 	/* save a pointer to the usb device */
 	usbduxfastsub[index].usbdev = udev;
 

1.6.5.2

From: Thomas Gleixner <[email protected]>

From: Thomas Gleixner <[email protected]>
Date: Sun, 26 Jul 2009 00:59:33 +0200
Subject: [PATCH 124/570] staging: Bulk convert the semaphore mess

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert staging users.

I have broken the original patch down into separate patches per file because the original patch no longer applies.

---
 drivers/staging/frontier/alphatrack.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 15aed87..d4d801e 100644
@@ -678,7 +678,7 @@ static int usb_alphatrack_probe(struct usb_interface *intf,
 		dev_err(&intf->dev, "Out of memory\n");
 		goto exit;
 	}
-	init_MUTEX(&dev->sem);
+	semaphore_init(&dev->sem);
 	dev->intf = intf;
 	init_waitqueue_head(&dev->read_wait);
 	init_waitqueue_head(&dev->write_wait);

1.6.5.2

From: Thomas Gleixner <[email protected]>

From: Thomas Gleixner <[email protected]>
Date: Sun, 26 Jul 2009 00:59:33 +0200
Subject: [PATCH 124/570] staging: Bulk convert the semaphore mess

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert staging users.

I have broken the original patch down into separate patches per file because the original patch no longer applies.

---
 drivers/staging/frontier/tranzport.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

index ef8fcc8..8aaea2a 100644
@@ -153,7 +153,7 @@ struct usb_tranzport {
 };
 
 /* prevent races between open() and disconnect() */
-static DEFINE_MUTEX(disconnect_mutex);
+static DEFINE_SEMAPHORE(disconnect_mutex);
 
 static struct usb_driver usb_tranzport_driver;
 

@@ -800,7 +800,7 @@ static int usb_tranzport_probe(struct usb_interface *intf,
 		dev_err(&intf->dev, "Out of memory\n");
 		goto exit;
 	}
-	init_MUTEX(&dev->sem);
+	semaphore_init(&dev->sem);
 	dev->intf = intf;
 	init_waitqueue_head(&dev->read_wait);
 	init_waitqueue_head(&dev->write_wait);

1.6.5.2

From: Thomas Gleixner <[email protected]>

From: Thomas Gleixner <[email protected]>
Date: Sun, 26 Jul 2009 00:59:33 +0200
Subject: [PATCH 124/570] staging: Bulk convert the semaphore mess

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert staging users.

I have broken the original patch down into separate patches per file because the original patch no longer applies.

---
 drivers/staging/mimio/mimio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 1ba8103..63bf2db 100644
@@ -160,7 +160,7 @@ static struct usb_driver mimio_driver = {
 	.id_table = mimio_table,
 };
 
-static DECLARE_MUTEX(disconnect_sem);
+static DEFINE_SEMAPHORE(disconnect_sem);
 
 static void mimio_close(struct input_dev *idev)
 {

1.6.5.2

From: Thomas Gleixner <[email protected]>

From: Thomas Gleixner <[email protected]>
Date: Sun, 26 Jul 2009 00:59:33 +0200
Subject: [PATCH 124/570] staging: Bulk convert the semaphore mess

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert staging users.

I broke the original patch down into separate patches per file because the original patch no longer applies.

---
 drivers/staging/otus/wwrap.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 53d2a45..ab54e31 100644
@@ -1058,7 +1058,7 @@ u8_t zfLnxCreateThread(zdev_t *dev)
 
     /* Create Mutex and keventd */
     INIT_WORK(&macp->kevent, kevent);
-    init_MUTEX(&macp->ioctl_sem);
+    semaphore_init(&macp->ioctl_sem);
 
     return 0;
 }

1.6.5.2

From: Thomas Gleixner <[email protected]>

From: Thomas Gleixner <[email protected]>
Date: Sun, 26 Jul 2009 00:59:33 +0200
Subject: [PATCH 124/570] staging: Bulk convert the semaphore mess

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert staging users.

I broke the original patch down into separate patches per file because the original patch no longer applies.

---
 drivers/staging/p9auth/p9auth.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index db79626..2946651 100644
@@ -391,7 +391,7 @@ static int __init cap_init_module(void)
 	/* Initialize each device. */
 	for (i = 0; i < cap_nr_devs; i++) {
 		cap_devices[i].node_size = cap_node_size;
-		init_MUTEX(&cap_devices[i].sem);
+		semaphore_init(&cap_devices[i].sem);
 		cap_setup_cdev(&cap_devices[i], i);
 	}
 

1.6.5.2

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away.

---
 drivers/staging/dream/camera/mt9d112.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 4f938f9..4c21065 100644
@@ -36,7 +36,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);
 
 
 /*=============================================================

1.6.5.2

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away.

---
 drivers/staging/dream/camera/mt9p012_fox.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 70119d5..c12bb69 100644
@@ -122,7 +122,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

1.6.5.2

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away.

---
 drivers/staging/dream/camera/mt9t013.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 88229f2..1993a5d 100644
@@ -122,7 +122,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 */
 

1.6.5.2

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away.

---
 drivers/staging/dream/camera/s5k3e2fx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index edba198..b0e3e1d 100644
@@ -312,7 +312,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)

1.6.5.2

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away.

---
 drivers/staging/dream/pmem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index def6468..0740dfb 100644
@@ -1232,7 +1232,7 @@ int pmem_setup(struct android_pmem_platform_data *pdata,
 	pmem[id].ioctl = ioctl;
 	pmem[id].release = release;
 	init_rwsem(&pmem[id].bitmap_sem);
-	init_MUTEX(&pmem[id].data_list_sem);
+	semaphore_init(&pmem[id].data_list_sem);
 	INIT_LIST_HEAD(&pmem[id].data_list);
 	pmem[id].dev.name = pdata->name;
 	pmem[id].dev.minor = id;

1.6.5.2

From: Thomas Gleixner <[email protected]>

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away.

---
 drivers/staging/rt2860/common/rtmp_init.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 21a95ff..9365618 100644
@@ -3520,7 +3520,7 @@ int RtmpRaDevCtrlInit(struct rt_rtmp_adapter *pAd, IN RTMP_INF_TYPE infType)
 		 ("STA Driver version-%s\n", STA_DRIVER_VERSION));
 
 #ifdef RTMP_MAC_USB
-	init_MUTEX(&(pAd->UsbVendorReq_semaphore));
+	semaphore_init(&(pAd->UsbVendorReq_semaphore));
 	os_alloc_mem(pAd, (u8 **) & pAd->UsbVendorReqBuf,
 		     MAX_PARAM_BUFFER_SIZE - 1);
 	if (pAd->UsbVendorReqBuf == NULL) {

1.6.5.2

init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away.

---
 drivers/staging/vme/devices/vme_user.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index e228942..7cc609c 100644
@@ -639,7 +639,7 @@ static int __init vme_user_probe(struct device *dev, int cur_bus, int cur_slot)
 	for (i = 0; i < VME_DEVS; i++) {
 		image[i].kern_buf = NULL;
 		image[i].pci_buf = 0;
-		init_MUTEX(&(image[i].sem));
+		semaphore_init(&(image[i].sem));
 		image[i].device = NULL;
 		image[i].resource = NULL;
 		image[i].users = 0;

1.6.5.2

I forgot to mention that you can pull this from
git://git.kernel.org/pub/scm/linux/kernel/git/jkacur/jk-2.6.git
jk/v2.6.33-rc3-convert-semaphore

I can't do that, as it breaks when applying to Linus's latest tree, right?

If this needs to go through some other tree, no objection from me at all, feel free to add:

to them.

thanks,

greg k-h

Hi Greg.

This shouldn't break - I tested against 2.6.33-rc3, and I just retested against 2.6.33-rc4. The origin of the patch is in -rt but there is nothing -rt about it which is why I would like to push it upstream.

I don't have all that hardware, so my ability to test it is somewhat limited - and since these are all staging drivers, I was hoping that you would pick it up if Thomas doesn't have any objections.

Thanks

John

Try applying your first patch against 2.6.33-rc3 and then just building the code. It dies a horrible death :)

thanks,

greg k-h

Ugh! You're right Greg. These patches are pending Thomas's "Introduce anon_semaphore" going upstream first.

I'll wait for that before pushing these again.

Thanks.