CVS: 3 files have been modified in linux/drivers/char/bluetooth.

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

The following files were modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
bluetooth.c     1.138           1.139=20=20=20=20=20=20=20=20=20=20=20
sdp.c           1.64            1.65=20=20=20=20=20=20=20=20=20=20=20=20
sec_client.c    1.13            1.14=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Removed checks to see if KERNEL_VERSION() is defined, as it is now
guaranteed to be available.


The diff of the modified file(s):

--- bluetooth.c	2001/03/05 23:08:39	1.138
+++ bluetooth.c	2001/03/06 10:13:49	1.139
@@ -1926,7 +1926,6 @@
 #ifdef CONFIG_BLUETOOTH_PROC
 	DSYS("Registering BT proc files\n");
=20=20
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
 #if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
 	{
 		procfs_status =3D -1;
@@ -1941,17 +1940,12 @@
 #else
 	procfs_status =3D proc_register_dynamic(&proc_root, &bt_status);
 #endif /* LINUX_VERSION_CODE */
-#else  /* KERNEL_VERSION */
=20
-	procfs_status =3D proc_register_dynamic(&proc_root, &bt_status);
-#endif/* KERNEL_VERSION */
-
 	if (procfs_status < 0) {
 		D_ERR("Couldn't register proc file bt_status %d\n",=20
 		      procfs_status);
 	}
=20=09
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
 #if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
 	{
 		procfs_status =3D -1;
@@ -1966,16 +1960,12 @@
 #else
 	procfs_status =3D proc_register_dynamic(&proc_root, &bt_internal_info);
 #endif /* LINUX_VERSION_CODE */
-#else  /* KERNEL_VERSION */
-	procfs_status =3D proc_register_dynamic(&proc_root, &bt_internal_info);
-#endif/* KERNEL_VERSION */
=20
 	if (procfs_status < 0) {
 		D_ERR("Couldn't register proc file bt_internal_info %d\n",
 		      procfs_status);
 	}
=20
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
 #if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
 	{
 		struct proc_dir_entry *entry;
@@ -1997,9 +1987,6 @@
 #else
 	procfs_status =3D proc_register_dynamic(&proc_root, &sdp_proc_entry);
 #endif /* LINUX_VERSION_CODE */
-#else  /* KERNEL_VERSION */
-	procfs_status =3D proc_register_dynamic(&proc_root, &sdp_proc_entry);
-#endif/* KERNEL_VERSION */
=20
 	if (procfs_status < 0) {
 		D_ERR("Couldn't register proc file for sdp database %d\n",
@@ -2007,7 +1994,6 @@
 	}
=20
 #ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
 #if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
 	{
 		struct proc_dir_entry *entry;
@@ -2030,9 +2016,6 @@
 #else
 	procfs_status =3D proc_register_dynamic(&proc_root, &sec_man_proc_entry);
 #endif /* LINUX_VERSION_CODE */
-#else  /* KERNEL_VERSION */
-	procfs_status =3D proc_register_dynamic(&proc_root, &sec_man_proc_entry);
-#endif/* KERNEL_VERSION */
=20
 	if (procfs_status < 0) {
 		D_ERR("Couldn't register proc file for security manager %d\n",
@@ -2040,7 +2023,6 @@
 	}
 #endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
=20
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
 #if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
 	{
 		procfs_status =3D -1;
@@ -2055,18 +2037,13 @@
 #else
 	procfs_status =3D proc_register_dynamic(&proc_root, &bt_proc_doit);
 #endif /* LINUX_VERSION_CODE */
-#else  /* KERNEL_VERSION */
=20
-	procfs_status =3D proc_register_dynamic(&proc_root, &bt_proc_doit);
-#endif/* KERNEL_VERSION */
-
 	if (procfs_status < 0) {
 		D_ERR("Couldn't register proc file bt_status %d\n",=20
 		      procfs_status);
 	}
=20
 #ifdef CONFIG_BLUETOOTH_USE_TCI
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
 #if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
 	{
 		procfs_status =3D -1;
@@ -2081,9 +2058,6 @@
 #else
 	procfs_status =3D proc_register_dynamic(&proc_root, &tci_proc_entry);
 #endif /* LINUX_VERSION_CODE */
-#else  /* KERNEL_VERSION */
-	procfs_status =3D proc_register_dynamic(&proc_root, &tci_proc_entry);
-#endif/* KERNEL_VERSION */
=20
 	if (procfs_status < 0) {
 		D_ERR("Couldn't register proc file for tci database %d\n",
--- sdp.c	2001/03/04 15:56:54	1.64
+++ sdp.c	2001/03/06 10:13:49	1.65
@@ -99,10 +99,8 @@
=20
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
 #if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,2,14)
 #define USE_NEW_PROC
-#endif
 #endif
=20
 #ifndef __KERNEL__
--- sec_client.c	2001/03/05 15:52:52	1.13
+++ sec_client.c	2001/03/06 10:13:49	1.14
@@ -88,10 +88,8 @@
=20
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
 #if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,2,14)
 #define USE_NEW_PROC
-#endif
 #endif
=20
 #ifndef __KERNEL__