Re: [2.6 patch] drivers/isdn/hardware/eicon/: misc possible cleanups
On Wed, 9 Feb 2005, Adrian Bunk wrote: > On Sun, Feb 06, 2005 at 11:18:18AM +0100, Armin Schindler wrote: > > > Hi Adrian, > > Hi Armin, > > > thanks for the proposed patch. > > Making the functions static is a good idea, I will check and test this. > > Removing some functions, especially from io.* and di.* is not good. These > > functions are mainly used with other sub-drivers which are not part of the > > kernel. I will check if they are some really outdated and the removals in > > message.c. > > silly question: > Why are these sub-drivers not included in the kernel? These drivers are for older cards and are not fully ported to kernel 2.6. I never really intended to put this old stuff into kernel 2.6. The code of io.* and di.* is common code for all supported platforms, so I always try to reduce changes here. Like my last patch, I will try to remove unused code in linux with a preparser in my code-controller. So eventually the mentioned code is really unsused and can be removed. I will check all this in the next days and prepare a new patch. Armin - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [2.6 patch] drivers/isdn/hardware/eicon/: misc possible cleanups
On Sun, Feb 06, 2005 at 11:18:18AM +0100, Armin Schindler wrote: > Hi Adrian, Hi Armin, > thanks for the proposed patch. > Making the functions static is a good idea, I will check and test this. > Removing some functions, especially from io.* and di.* is not good. These > functions are mainly used with other sub-drivers which are not part of the > kernel. I will check if they are some really outdated and the removals in > message.c. silly question: Why are these sub-drivers not included in the kernel? > Armin cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [2.6 patch] drivers/isdn/hardware/eicon/: misc possible cleanups
On Sun, Feb 06, 2005 at 11:18:18AM +0100, Armin Schindler wrote: Hi Adrian, Hi Armin, thanks for the proposed patch. Making the functions static is a good idea, I will check and test this. Removing some functions, especially from io.* and di.* is not good. These functions are mainly used with other sub-drivers which are not part of the kernel. I will check if they are some really outdated and the removals in message.c. silly question: Why are these sub-drivers not included in the kernel? Armin cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [2.6 patch] drivers/isdn/hardware/eicon/: misc possible cleanups
On Wed, 9 Feb 2005, Adrian Bunk wrote: On Sun, Feb 06, 2005 at 11:18:18AM +0100, Armin Schindler wrote: Hi Adrian, Hi Armin, thanks for the proposed patch. Making the functions static is a good idea, I will check and test this. Removing some functions, especially from io.* and di.* is not good. These functions are mainly used with other sub-drivers which are not part of the kernel. I will check if they are some really outdated and the removals in message.c. silly question: Why are these sub-drivers not included in the kernel? These drivers are for older cards and are not fully ported to kernel 2.6. I never really intended to put this old stuff into kernel 2.6. The code of io.* and di.* is common code for all supported platforms, so I always try to reduce changes here. Like my last patch, I will try to remove unused code in linux with a preparser in my code-controller. So eventually the mentioned code is really unsused and can be removed. I will check all this in the next days and prepare a new patch. Armin - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [2.6 patch] drivers/isdn/hardware/eicon/: misc possible cleanups
Hi Adrian,
thanks for the proposed patch.
Making the functions static is a good idea, I will check and test this.
Removing some functions, especially from io.* and di.* is not good. These
functions are mainly used with other sub-drivers which are not part of the
kernel. I will check if they are some really outdated and the removals in
message.c.
Armin
On Sun, 6 Feb 2005, Adrian Bunk wrote:
> This patch contains the following possible cleanups:
> - make some needlessly global code static
> - dadapter.h: remoe the unused #define OLD_MAX_DESCRIPTORS
> - remove the following unused functions:
> - di.c: pr_test_int
> - di.c: pr_clear_int
> - di.c: scom_out
> - di.c: scom_ready
> - di.c: scom_dpc
> - di.c: quadro_clear_int
> - io.c: outp_words_from_buffer
> - io.c: inp_words_to_buffer
> - message.c: #if 0 some unused functions
>
> Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
>
> ---
>
> drivers/isdn/hardware/eicon/capifunc.c |2
> drivers/isdn/hardware/eicon/dadapter.c |6
> drivers/isdn/hardware/eicon/dadapter.h |7
> drivers/isdn/hardware/eicon/di.c| 201
> drivers/isdn/hardware/eicon/di.h|5
> drivers/isdn/hardware/eicon/diva_didd.c |2
> drivers/isdn/hardware/eicon/divamnt.c |4
> drivers/isdn/hardware/eicon/io.c| 32 ---
> drivers/isdn/hardware/eicon/io.h|5
> drivers/isdn/hardware/eicon/message.c | 64 ---
> drivers/isdn/hardware/eicon/os_4bri.c |4
> 11 files changed, 55 insertions(+), 277 deletions(-)
>
> --- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/capifunc.c.old
> 2005-02-05 15:45:40.0 +0100
> +++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/capifunc.c
> 2005-02-05 15:45:56.0 +0100
> @@ -64,7 +64,7 @@
> */
> static void no_printf(unsigned char *, ...);
> #include "debuglib.c"
> -void xlog(char *x, ...)
> +static void xlog(char *x, ...)
> {
> #ifndef DIVA_NO_DEBUGLIB
> va_list ap;
> --- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.h.old
> 2005-02-05 15:46:38.0 +0100
> +++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.h
> 2005-02-05 15:47:56.0 +0100
> @@ -25,11 +25,10 @@
> */
> #ifndef __DIVA_DIDD_DADAPTER_INC__
> #define __DIVA_DIDD_DADAPTER_INC__
> +
> void diva_didd_load_time_init (void);
> void diva_didd_load_time_finit (void);
> -int diva_didd_add_descriptor (DESCRIPTOR* d);
> -int diva_didd_remove_descriptor (IDI_CALL request);
> -int diva_didd_read_adapter_array (DESCRIPTOR* buffer, int length);
> -#define OLD_MAX_DESCRIPTORS 16
> +
> #define NEW_MAX_DESCRIPTORS 64
> +
> #endif
> --- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.c.old
> 2005-02-05 15:48:17.0 +0100
> +++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.c
> 2005-02-05 15:48:46.0 +0100
> @@ -106,7 +106,7 @@
>return adapter handle (> 0) on success
>return -1 adapter array overflow
>--
> */
> -int diva_didd_add_descriptor (DESCRIPTOR* d) {
> +static int diva_didd_add_descriptor (DESCRIPTOR* d) {
> diva_os_spin_lock_magic_t irql;
> int i;
> if (d->type == IDI_DIMAINT) {
> @@ -143,7 +143,7 @@
>return adapter handle (> 0) on success
>return 0 on success
>--
> */
> -int diva_didd_remove_descriptor (IDI_CALL request) {
> +static int diva_didd_remove_descriptor (IDI_CALL request) {
> diva_os_spin_lock_magic_t irql;
> int i;
> if (request == MAdapter.request) {
> @@ -171,7 +171,7 @@
>Read adapter array
>return 1 if not enough space to save all available adapters
>
> -- */
> -int diva_didd_read_adapter_array (DESCRIPTOR* buffer, int length) {
> +static int diva_didd_read_adapter_array (DESCRIPTOR* buffer, int length) {
> diva_os_spin_lock_magic_t irql;
> int src, dst;
> memset (buffer, 0x00, length);
> --- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/di.h.old
> 2005-02-05 15:55:28.0 +0100
> +++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/di.h
> 2005-02-05 15:57:24.0 +0100
> @@ -81,13 +81,8 @@
> /*--*/
> void pr_out(ADAPTER * a);
> byte pr_dpc(ADAPTER * a);
> -byte pr_test_int(ADAPTER * a);
> -void pr_clear_int(ADAPTER * a);
> -void scom_out(ADAPTER * a);
> -byte scom_dpc(ADAPTER * a);
> byte scom_test_int(ADAPTER * a);
> void scom_clear_int(ADAPTER * a);
> -void quadro_clear_int(ADAPTER * a);
> /*--*/
> /* OS specific functions used by IDI common code*/
> /*--*/
> ---
Re: [2.6 patch] drivers/isdn/hardware/eicon/: misc possible cleanups
Hi Adrian,
thanks for the proposed patch.
Making the functions static is a good idea, I will check and test this.
Removing some functions, especially from io.* and di.* is not good. These
functions are mainly used with other sub-drivers which are not part of the
kernel. I will check if they are some really outdated and the removals in
message.c.
Armin
On Sun, 6 Feb 2005, Adrian Bunk wrote:
This patch contains the following possible cleanups:
- make some needlessly global code static
- dadapter.h: remoe the unused #define OLD_MAX_DESCRIPTORS
- remove the following unused functions:
- di.c: pr_test_int
- di.c: pr_clear_int
- di.c: scom_out
- di.c: scom_ready
- di.c: scom_dpc
- di.c: quadro_clear_int
- io.c: outp_words_from_buffer
- io.c: inp_words_to_buffer
- message.c: #if 0 some unused functions
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
drivers/isdn/hardware/eicon/capifunc.c |2
drivers/isdn/hardware/eicon/dadapter.c |6
drivers/isdn/hardware/eicon/dadapter.h |7
drivers/isdn/hardware/eicon/di.c| 201
drivers/isdn/hardware/eicon/di.h|5
drivers/isdn/hardware/eicon/diva_didd.c |2
drivers/isdn/hardware/eicon/divamnt.c |4
drivers/isdn/hardware/eicon/io.c| 32 ---
drivers/isdn/hardware/eicon/io.h|5
drivers/isdn/hardware/eicon/message.c | 64 ---
drivers/isdn/hardware/eicon/os_4bri.c |4
11 files changed, 55 insertions(+), 277 deletions(-)
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/capifunc.c.old
2005-02-05 15:45:40.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/capifunc.c
2005-02-05 15:45:56.0 +0100
@@ -64,7 +64,7 @@
*/
static void no_printf(unsigned char *, ...);
#include debuglib.c
-void xlog(char *x, ...)
+static void xlog(char *x, ...)
{
#ifndef DIVA_NO_DEBUGLIB
va_list ap;
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.h.old
2005-02-05 15:46:38.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.h
2005-02-05 15:47:56.0 +0100
@@ -25,11 +25,10 @@
*/
#ifndef __DIVA_DIDD_DADAPTER_INC__
#define __DIVA_DIDD_DADAPTER_INC__
+
void diva_didd_load_time_init (void);
void diva_didd_load_time_finit (void);
-int diva_didd_add_descriptor (DESCRIPTOR* d);
-int diva_didd_remove_descriptor (IDI_CALL request);
-int diva_didd_read_adapter_array (DESCRIPTOR* buffer, int length);
-#define OLD_MAX_DESCRIPTORS 16
+
#define NEW_MAX_DESCRIPTORS 64
+
#endif
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.c.old
2005-02-05 15:48:17.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.c
2005-02-05 15:48:46.0 +0100
@@ -106,7 +106,7 @@
return adapter handle ( 0) on success
return -1 adapter array overflow
--
*/
-int diva_didd_add_descriptor (DESCRIPTOR* d) {
+static int diva_didd_add_descriptor (DESCRIPTOR* d) {
diva_os_spin_lock_magic_t irql;
int i;
if (d-type == IDI_DIMAINT) {
@@ -143,7 +143,7 @@
return adapter handle ( 0) on success
return 0 on success
--
*/
-int diva_didd_remove_descriptor (IDI_CALL request) {
+static int diva_didd_remove_descriptor (IDI_CALL request) {
diva_os_spin_lock_magic_t irql;
int i;
if (request == MAdapter.request) {
@@ -171,7 +171,7 @@
Read adapter array
return 1 if not enough space to save all available adapters
-- */
-int diva_didd_read_adapter_array (DESCRIPTOR* buffer, int length) {
+static int diva_didd_read_adapter_array (DESCRIPTOR* buffer, int length) {
diva_os_spin_lock_magic_t irql;
int src, dst;
memset (buffer, 0x00, length);
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/di.h.old
2005-02-05 15:55:28.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/di.h
2005-02-05 15:57:24.0 +0100
@@ -81,13 +81,8 @@
/*--*/
void pr_out(ADAPTER * a);
byte pr_dpc(ADAPTER * a);
-byte pr_test_int(ADAPTER * a);
-void pr_clear_int(ADAPTER * a);
-void scom_out(ADAPTER * a);
-byte scom_dpc(ADAPTER * a);
byte scom_test_int(ADAPTER * a);
void scom_clear_int(ADAPTER * a);
-void quadro_clear_int(ADAPTER * a);
/*--*/
/* OS specific functions used by IDI common code*/
/*--*/
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/di.c.old
2005-02-05 15:55:47.0 +0100
+++
[2.6 patch] drivers/isdn/hardware/eicon/: misc possible cleanups
This patch contains the following possible cleanups:
- make some needlessly global code static
- dadapter.h: remoe the unused #define OLD_MAX_DESCRIPTORS
- remove the following unused functions:
- di.c: pr_test_int
- di.c: pr_clear_int
- di.c: scom_out
- di.c: scom_ready
- di.c: scom_dpc
- di.c: quadro_clear_int
- io.c: outp_words_from_buffer
- io.c: inp_words_to_buffer
- message.c: #if 0 some unused functions
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
---
drivers/isdn/hardware/eicon/capifunc.c |2
drivers/isdn/hardware/eicon/dadapter.c |6
drivers/isdn/hardware/eicon/dadapter.h |7
drivers/isdn/hardware/eicon/di.c| 201
drivers/isdn/hardware/eicon/di.h|5
drivers/isdn/hardware/eicon/diva_didd.c |2
drivers/isdn/hardware/eicon/divamnt.c |4
drivers/isdn/hardware/eicon/io.c| 32 ---
drivers/isdn/hardware/eicon/io.h|5
drivers/isdn/hardware/eicon/message.c | 64 ---
drivers/isdn/hardware/eicon/os_4bri.c |4
11 files changed, 55 insertions(+), 277 deletions(-)
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/capifunc.c.old
2005-02-05 15:45:40.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/capifunc.c
2005-02-05 15:45:56.0 +0100
@@ -64,7 +64,7 @@
*/
static void no_printf(unsigned char *, ...);
#include "debuglib.c"
-void xlog(char *x, ...)
+static void xlog(char *x, ...)
{
#ifndef DIVA_NO_DEBUGLIB
va_list ap;
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.h.old
2005-02-05 15:46:38.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.h
2005-02-05 15:47:56.0 +0100
@@ -25,11 +25,10 @@
*/
#ifndef __DIVA_DIDD_DADAPTER_INC__
#define __DIVA_DIDD_DADAPTER_INC__
+
void diva_didd_load_time_init (void);
void diva_didd_load_time_finit (void);
-int diva_didd_add_descriptor (DESCRIPTOR* d);
-int diva_didd_remove_descriptor (IDI_CALL request);
-int diva_didd_read_adapter_array (DESCRIPTOR* buffer, int length);
-#define OLD_MAX_DESCRIPTORS 16
+
#define NEW_MAX_DESCRIPTORS 64
+
#endif
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.c.old
2005-02-05 15:48:17.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.c
2005-02-05 15:48:46.0 +0100
@@ -106,7 +106,7 @@
return adapter handle (> 0) on success
return -1 adapter array overflow
-- */
-int diva_didd_add_descriptor (DESCRIPTOR* d) {
+static int diva_didd_add_descriptor (DESCRIPTOR* d) {
diva_os_spin_lock_magic_t irql;
int i;
if (d->type == IDI_DIMAINT) {
@@ -143,7 +143,7 @@
return adapter handle (> 0) on success
return 0 on success
-- */
-int diva_didd_remove_descriptor (IDI_CALL request) {
+static int diva_didd_remove_descriptor (IDI_CALL request) {
diva_os_spin_lock_magic_t irql;
int i;
if (request == MAdapter.request) {
@@ -171,7 +171,7 @@
Read adapter array
return 1 if not enough space to save all available adapters
--
*/
-int diva_didd_read_adapter_array (DESCRIPTOR* buffer, int length) {
+static int diva_didd_read_adapter_array (DESCRIPTOR* buffer, int length) {
diva_os_spin_lock_magic_t irql;
int src, dst;
memset (buffer, 0x00, length);
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/di.h.old
2005-02-05 15:55:28.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/di.h 2005-02-05
15:57:24.0 +0100
@@ -81,13 +81,8 @@
/*--*/
void pr_out(ADAPTER * a);
byte pr_dpc(ADAPTER * a);
-byte pr_test_int(ADAPTER * a);
-void pr_clear_int(ADAPTER * a);
-void scom_out(ADAPTER * a);
-byte scom_dpc(ADAPTER * a);
byte scom_test_int(ADAPTER * a);
void scom_clear_int(ADAPTER * a);
-void quadro_clear_int(ADAPTER * a);
/*--*/
/* OS specific functions used by IDI common code*/
/*--*/
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/di.c.old
2005-02-05 15:55:47.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/di.c 2005-02-05
17:42:51.0 +0100
@@ -42,10 +42,7 @@
/*--*/
void pr_out(ADAPTER * a);
byte pr_dpc(ADAPTER * a);
-void scom_out(ADAPTER * a);
-byte scom_dpc(ADAPTER * a);
static byte pr_ready(ADAPTER * a);
-static byte scom_ready(ADAPTER * a);
static byte isdn_rc(ADAPTER *, byte, byte, byte, word, dword, dword);
static byte isdn_ind(ADAPTER *, byte, byte, byte, PBUFFER *, byte,
[2.6 patch] drivers/isdn/hardware/eicon/: misc possible cleanups
This patch contains the following possible cleanups:
- make some needlessly global code static
- dadapter.h: remoe the unused #define OLD_MAX_DESCRIPTORS
- remove the following unused functions:
- di.c: pr_test_int
- di.c: pr_clear_int
- di.c: scom_out
- di.c: scom_ready
- di.c: scom_dpc
- di.c: quadro_clear_int
- io.c: outp_words_from_buffer
- io.c: inp_words_to_buffer
- message.c: #if 0 some unused functions
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
drivers/isdn/hardware/eicon/capifunc.c |2
drivers/isdn/hardware/eicon/dadapter.c |6
drivers/isdn/hardware/eicon/dadapter.h |7
drivers/isdn/hardware/eicon/di.c| 201
drivers/isdn/hardware/eicon/di.h|5
drivers/isdn/hardware/eicon/diva_didd.c |2
drivers/isdn/hardware/eicon/divamnt.c |4
drivers/isdn/hardware/eicon/io.c| 32 ---
drivers/isdn/hardware/eicon/io.h|5
drivers/isdn/hardware/eicon/message.c | 64 ---
drivers/isdn/hardware/eicon/os_4bri.c |4
11 files changed, 55 insertions(+), 277 deletions(-)
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/capifunc.c.old
2005-02-05 15:45:40.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/capifunc.c
2005-02-05 15:45:56.0 +0100
@@ -64,7 +64,7 @@
*/
static void no_printf(unsigned char *, ...);
#include debuglib.c
-void xlog(char *x, ...)
+static void xlog(char *x, ...)
{
#ifndef DIVA_NO_DEBUGLIB
va_list ap;
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.h.old
2005-02-05 15:46:38.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.h
2005-02-05 15:47:56.0 +0100
@@ -25,11 +25,10 @@
*/
#ifndef __DIVA_DIDD_DADAPTER_INC__
#define __DIVA_DIDD_DADAPTER_INC__
+
void diva_didd_load_time_init (void);
void diva_didd_load_time_finit (void);
-int diva_didd_add_descriptor (DESCRIPTOR* d);
-int diva_didd_remove_descriptor (IDI_CALL request);
-int diva_didd_read_adapter_array (DESCRIPTOR* buffer, int length);
-#define OLD_MAX_DESCRIPTORS 16
+
#define NEW_MAX_DESCRIPTORS 64
+
#endif
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.c.old
2005-02-05 15:48:17.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/dadapter.c
2005-02-05 15:48:46.0 +0100
@@ -106,7 +106,7 @@
return adapter handle ( 0) on success
return -1 adapter array overflow
-- */
-int diva_didd_add_descriptor (DESCRIPTOR* d) {
+static int diva_didd_add_descriptor (DESCRIPTOR* d) {
diva_os_spin_lock_magic_t irql;
int i;
if (d-type == IDI_DIMAINT) {
@@ -143,7 +143,7 @@
return adapter handle ( 0) on success
return 0 on success
-- */
-int diva_didd_remove_descriptor (IDI_CALL request) {
+static int diva_didd_remove_descriptor (IDI_CALL request) {
diva_os_spin_lock_magic_t irql;
int i;
if (request == MAdapter.request) {
@@ -171,7 +171,7 @@
Read adapter array
return 1 if not enough space to save all available adapters
--
*/
-int diva_didd_read_adapter_array (DESCRIPTOR* buffer, int length) {
+static int diva_didd_read_adapter_array (DESCRIPTOR* buffer, int length) {
diva_os_spin_lock_magic_t irql;
int src, dst;
memset (buffer, 0x00, length);
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/di.h.old
2005-02-05 15:55:28.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/di.h 2005-02-05
15:57:24.0 +0100
@@ -81,13 +81,8 @@
/*--*/
void pr_out(ADAPTER * a);
byte pr_dpc(ADAPTER * a);
-byte pr_test_int(ADAPTER * a);
-void pr_clear_int(ADAPTER * a);
-void scom_out(ADAPTER * a);
-byte scom_dpc(ADAPTER * a);
byte scom_test_int(ADAPTER * a);
void scom_clear_int(ADAPTER * a);
-void quadro_clear_int(ADAPTER * a);
/*--*/
/* OS specific functions used by IDI common code*/
/*--*/
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/di.c.old
2005-02-05 15:55:47.0 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/hardware/eicon/di.c 2005-02-05
17:42:51.0 +0100
@@ -42,10 +42,7 @@
/*--*/
void pr_out(ADAPTER * a);
byte pr_dpc(ADAPTER * a);
-void scom_out(ADAPTER * a);
-byte scom_dpc(ADAPTER * a);
static byte pr_ready(ADAPTER * a);
-static byte scom_ready(ADAPTER * a);
static byte isdn_rc(ADAPTER *, byte, byte, byte, word, dword, dword);
static byte isdn_ind(ADAPTER *, byte, byte, byte, PBUFFER *, byte, word);
/*
