[Zyxel630-11-cvs] amedyn2/module usbatm.c,1.13,1.14

[Aurelio <sk...@us...>]

Update of /cvsroot/zyxel630-11/amedyn2/module
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21890

Modified Files:
	usbatm.c 
Log Message:

Resync with kernel tree (semaphore -> mutex changes). (usbatm CVS 1.64)


Index: usbatm.c
===================================================================
RCS file: /cvsroot/zyxel630-11/amedyn2/module/usbatm.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** usbatm.c	11 Mar 2006 12:36:32 -0000	1.13
--- usbatm.c	18 Nov 2006 12:44:50 -0000	1.14
***************
*** 232,236 ****
  ************/
  
! static inline struct urb *usbatm_pop_urb(struct usbatm_channel *channel)
  {
  	struct urb *urb;
--- 232,236 ----
  ************/
  
! static struct urb *usbatm_pop_urb(struct usbatm_channel *channel)
  {
  	struct urb *urb;
***************
*** 249,253 ****
  }
  
! static inline int usbatm_submit_urb(struct urb *urb)
  {
  	struct usbatm_channel *channel = urb->context;
--- 249,253 ----
  }
  
! static int usbatm_submit_urb(struct urb *urb)
  {
  	struct usbatm_channel *channel = urb->context;
***************
*** 896,900 ****
  	}
  
! 	down(&instance->serialize);	/* vs self, usbatm_atm_close, usbatm_usb_disconnect */
  
  	if (instance->disconnected) {
--- 896,900 ----
  	}
  
! 	mutex_lock(&instance->serialize);	/* vs self, usbatm_atm_close, usbatm_usb_disconnect */
  
  	if (instance->disconnected) {
***************
*** 940,944 ****
  	set_bit(ATM_VF_READY, &vcc->flags);
  
! 	up(&instance->serialize);
  
  	atm_dbg(instance, "%s: allocated vcc data 0x%p\n", __func__, new);
--- 940,944 ----
  	set_bit(ATM_VF_READY, &vcc->flags);
  
! 	mutex_unlock(&instance->serialize);
  
  	atm_dbg(instance, "%s: allocated vcc data 0x%p\n", __func__, new);
***************
*** 948,952 ****
  fail:
  	kfree(new);
! 	up(&instance->serialize);
  	return ret;
  }
--- 948,952 ----
  fail:
  	kfree(new);
! 	mutex_unlock(&instance->serialize);
  	return ret;
  }
***************
*** 969,973 ****
  	usbatm_cancel_send(instance, vcc);
  
! 	down(&instance->serialize);	/* vs self, usbatm_atm_open, usbatm_usb_disconnect */
  
  	tasklet_disable(&instance->rx_channel.tasklet);
--- 969,973 ----
  	usbatm_cancel_send(instance, vcc);
  
! 	mutex_lock(&instance->serialize);	/* vs self, usbatm_atm_open, usbatm_usb_disconnect */
  
  	tasklet_disable(&instance->rx_channel.tasklet);
***************
*** 992,996 ****
  	clear_bit(ATM_VF_ADDR, &vcc->flags);
  
! 	up(&instance->serialize);
  
  	atm_dbg(instance, "%s successful\n", __func__);
--- 992,996 ----
  	clear_bit(ATM_VF_ADDR, &vcc->flags);
  
! 	mutex_unlock(&instance->serialize);
  
  	atm_dbg(instance, "%s successful\n", __func__);
***************
*** 1082,1088 ****
  		ret = usbatm_atm_init(instance);
  
! 	down(&instance->serialize);
  	instance->thread_pid = -1;
! 	up(&instance->serialize);
  
  	complete_and_exit(&instance->thread_exited, ret);
--- 1082,1088 ----
  		ret = usbatm_atm_init(instance);
  
! 	mutex_lock(&instance->serialize);
  	instance->thread_pid = -1;
! 	mutex_unlock(&instance->serialize);
  
  	complete_and_exit(&instance->thread_exited, ret);
***************
*** 1098,1104 ****
  	}
  
! 	down(&instance->serialize);
  	instance->thread_pid = ret;
! 	up(&instance->serialize);
  
  	wait_for_completion(&instance->thread_started);
--- 1098,1104 ----
  	}
  
! 	mutex_lock(&instance->serialize);
  	instance->thread_pid = ret;
! 	mutex_unlock(&instance->serialize);
  
  	wait_for_completion(&instance->thread_started);
***************
*** 1183,1187 ****
  
  	kref_init(&instance->refcount);		/* dropped in usbatm_usb_disconnect */
! 	init_MUTEX(&instance->serialize);
  
  	instance->thread_pid = -1;
--- 1183,1187 ----
  
  	kref_init(&instance->refcount);		/* dropped in usbatm_usb_disconnect */
! 	mutex_init(&instance->serialize);
  
  	instance->thread_pid = -1;
***************
*** 1346,1361 ****
  	usb_set_intfdata(intf, NULL);
  
! 	down(&instance->serialize);
  	instance->disconnected = 1;
  	if (instance->thread_pid >= 0)
  		kill_proc(instance->thread_pid, SIGTERM, 1);
! 	up(&instance->serialize);
  
  	wait_for_completion(&instance->thread_exited);
  
! 	down(&instance->serialize);
  	list_for_each_entry(vcc_data, &instance->vcc_list, list)
  		vcc_release_async(vcc_data->vcc, -EPIPE);
! 	up(&instance->serialize);
  
  	tasklet_disable(&instance->rx_channel.tasklet);
--- 1346,1361 ----
  	usb_set_intfdata(intf, NULL);
  
! 	mutex_lock(&instance->serialize);
  	instance->disconnected = 1;
  	if (instance->thread_pid >= 0)
  		kill_proc(instance->thread_pid, SIGTERM, 1);
! 	mutex_unlock(&instance->serialize);
  
  	wait_for_completion(&instance->thread_exited);
  
! 	mutex_lock(&instance->serialize);
  	list_for_each_entry(vcc_data, &instance->vcc_list, list)
  		vcc_release_async(vcc_data->vcc, -EPIPE);
! 	mutex_unlock(&instance->serialize);
  
  	tasklet_disable(&instance->rx_channel.tasklet);