CVS: The file 'linux/drivers/char/bluetooth/bluetooth.c' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in linux/drivers/char/bluetooth:

Name         Old version  New version  Tag  Comment
----         -----------  -----------  ---  -------
bluetooth.c  1.229        1.230=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Fixed two compiler warnings.


The diff of the modified file(s):

--- bluetooth.c	31 Jul 2002 08:21:16 -0000	1.229
+++ bluetooth.c	1 Aug 2002 16:13:17 -0000	1.230
@@ -208,7 +208,9 @@
 static s32 bt_ctrl_init(void);
 static s32 bt_connect(u8 *bd_addr, u32 con_id);
 static s32 bt_disconnect(u32 con_id);
+#if BT_DRIVER_DEBUG
 static const u8* psmname(u16 psm);
+#endif
 static void wq_timeout(unsigned long ptr);
 static s32 bt_execute_sdp_request(bt_sdp_request *sdpRequest);
=20
@@ -445,7 +447,9 @@
 static s32
 bt_open(struct tty_struct *tty, struct file * filp)
 {
+#if BT_DRIVER_DEBUG
 	s32 line =3D GET_TTYLINE(tty);
+#endif
 	s32 ret_val;
=20=09
 	BT_DRIVER(__FUNCTION__ ": Line %d\n", line);=09
@@ -492,7 +496,6 @@
 		sertty->driver.flush_chars(sertty);
 }
=20
-
 static s32=20
 bt_write_room(struct tty_struct *tty)
 {
@@ -558,7 +561,6 @@
 		}
 	}
=20=09
-=09
         switch (cmd) {
 	case BT_SDP_REQUEST:
 	{
@@ -2464,7 +2466,6 @@
 		return -MSGCODE(MSG_BT_INTERFACE, BT_NOTCONNECTED);
 	}
=20=09
-
 	switch(GET_PSM(con_id))
 	{
 	case RFCOMM_LAYER:
@@ -2864,7 +2865,7 @@
 static void
 bt_show_version(void)
 {
-	printk("Bluetooth Driver v1.3, Copyright (c) 2000, 2001 Axis Communicatio=
ns AB\n");
+	printk("Bluetooth Driver v1.3, Copyright (c) 2000, 2001, 2002 Axis Commun=
ications AB\n");
 }
=20
 s32
@@ -2932,7 +2933,6 @@
 	unsigned long page;
 	s32 retval =3D 0;
=20=09
-
 	/* shutdown if already initiated */
 	if (bt_stack_initiated)
 		bt_shutdown();
@@ -2977,7 +2977,6 @@
 	  return retval;
 	}
=20=09
-
 #ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP
 	if (bt_use_bcsp(-1) && !bcsp_issyncronized()) {=20=20
 		if (bcsp_init() < 0) {
@@ -3452,6 +3451,7 @@
 	return 0;
 }
=20
+#if BT_DRIVER_DEBUG
 static const u8*
 psmname(u16 psm)
 {
@@ -3467,10 +3467,11 @@
 		return "UNKNOWN";
 	}
 }
+#endif
=20
-/* FIXME: Make a general sleepfunction a la L2ca_wait and let the this fun=
ction handle all
-   sleeping. Add a waitqueue object to the timer and let timerdata=3Dbt_ti=
mer_obj to set
-   inuse=3D0 if we timeout */
+/* FIXME: Make a general sleep function a la L2ca_wait and let the this
+   function handle all sleeping. Add a waitqueue object to the timer and l=
et
+   timerdata=3Dbt_timer_obj to set inuse=3D0 if we timeout */
=20
 #if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
 void