Merge with Linux 2.4.0-test10.

6 files changed, 30 insertions, 30 deletions

diff --git a/drivers/char/ftape/zftape/zftape-buffers.c b/drivers/char/ftape/zftape/zftape-buffers.c
index bafc7e1a9..f3dace343 100644
--- a/drivers/char/ftape/zftape/zftape-buffers.c
+++ b/drivers/char/ftape/zftape/zftape-buffers.c
@@ -48,8 +48,8 @@
 
 /*  local varibales
  */
-static unsigned int used_memory = 0;
-static unsigned int peak_memory = 0;
+static unsigned int used_memory;
+static unsigned int peak_memory;
 
 void zft_memory_stats(void)
 {
diff --git a/drivers/char/ftape/zftape/zftape-ctl.c b/drivers/char/ftape/zftape/zftape-ctl.c
index da2010ceb..6441ca929 100644
--- a/drivers/char/ftape/zftape/zftape-ctl.c
+++ b/drivers/char/ftape/zftape/zftape-ctl.c
@@ -49,16 +49,16 @@
 
 /*      Global vars.
  */
-int zft_write_protected = 0; /* this is when cartridge rdonly or O_RDONLY */
-int zft_header_read     = 0;
-int zft_offline         = 0;
-unsigned int zft_unit   = 0;
-int zft_resid           = 0;
-int zft_mt_compression  = 0;
+int zft_write_protected; /* this is when cartridge rdonly or O_RDONLY */
+int zft_header_read;
+int zft_offline;
+unsigned int zft_unit;
+int zft_resid;
+int zft_mt_compression;
 
 /*      Local vars.
  */
-static int going_offline   = 0;
+static int going_offline;
 
 typedef int (mt_fun)(int *argptr);
 typedef int (*mt_funp)(int *argptr);
diff --git a/drivers/char/ftape/zftape/zftape-read.c b/drivers/char/ftape/zftape/zftape-read.c
index 91ed51423..756ee3239 100644
--- a/drivers/char/ftape/zftape/zftape-read.c
+++ b/drivers/char/ftape/zftape/zftape-read.c
@@ -45,11 +45,11 @@
 
 /*      Global vars.
  */
-int zft_just_before_eof = 0;
+int zft_just_before_eof;
 
 /*      Local vars.
  */
-static int buf_len_rd = 0;
+static int buf_len_rd;
 
 void zft_zap_read_buffers(void)
 {
@@ -194,7 +194,7 @@ static int check_read_access(int *req_len,
 			     int *req_clipped, 
 			     const zft_position *pos)
 {
-	static __s64 remaining = 0;
+	static __s64 remaining;
 	static int eod;
 	TRACE_FUN(ft_t_flow);
 	
diff --git a/drivers/char/ftape/zftape/zftape-rw.c b/drivers/char/ftape/zftape/zftape-rw.c
index 784068096..9e599530c 100644
--- a/drivers/char/ftape/zftape/zftape-rw.c
+++ b/drivers/char/ftape/zftape/zftape-rw.c
@@ -41,14 +41,14 @@
 /*      Global vars.
  */
 
-__u8 *zft_deblock_buf = NULL;
-__u8 *zft_hseg_buf    = NULL;
+__u8 *zft_deblock_buf;
+__u8 *zft_hseg_buf;
 int zft_deblock_segment = -1;
 zft_status_enum zft_io_state = zft_idle;
-int zft_header_changed         = 0;
-int zft_bad_sector_map_changed = 0;
-int zft_qic113 = 0; /* conform to old specs. and old zftape */
-int zft_use_compression        = 0;
+int zft_header_changed;
+int zft_bad_sector_map_changed;
+int zft_qic113; /* conform to old specs. and old zftape */
+int zft_use_compression;
 zft_position zft_pos = {
 	-1, /* seg_pos */
 	0,  /* seg_byte_pos */
@@ -56,10 +56,10 @@ zft_position zft_pos = {
 	0   /* volume_pos */
 };
 unsigned int zft_blk_sz = CONFIG_ZFT_DFLT_BLK_SZ;
-__s64 zft_capacity      = 0;
+__s64 zft_capacity;
 
-unsigned int zft_written_segments = 0;
-int zft_label_changed = 0;
+unsigned int zft_written_segments;
+int zft_label_changed;
 
 /*      Local vars.
  */
@@ -165,8 +165,8 @@ int zft_calc_seg_byte_coord(int *seg_byte_pos, __s64 tape_pos)
  * Also, it might be in the future that the bad sector map gets
  * changed.  -> reset the cache
  */
-static int seg_pos    = 0;
-static __s64 tape_pos = 0;
+static int seg_pos;
+static __s64 tape_pos;
 
 __s64 zft_get_capacity(void)
 {
diff --git a/drivers/char/ftape/zftape/zftape-vtbl.c b/drivers/char/ftape/zftape/zftape-vtbl.c
index cf0ef2325..e4804ea2e 100644
--- a/drivers/char/ftape/zftape/zftape-vtbl.c
+++ b/drivers/char/ftape/zftape/zftape-vtbl.c
@@ -48,8 +48,8 @@
  *  global variables 
  */
 int zft_qic_mode   = 1; /* use the vtbl */
-int zft_old_ftape  = 0; /* prevents old ftaped tapes to be overwritten */
-int zft_volume_table_changed = 0; /* for write_header_segments() */
+int zft_old_ftape; /* prevents old ftaped tapes to be overwritten */
+int zft_volume_table_changed; /* for write_header_segments() */
 
 /*
  *  private variables (only exported for inline functions)
@@ -59,9 +59,9 @@ LIST_HEAD(zft_vtbl);
 /*  We could also allocate these dynamically when extracting the volume table
  *  sizeof(zft_volinfo) is about 32 or something close to that
  */
-static zft_volinfo  tape_vtbl = { {NULL, NULL}, 0, };
-static zft_volinfo  eot_vtbl  = { {NULL, NULL}, 0, };
-static zft_volinfo *cur_vtbl = NULL;
+static zft_volinfo  tape_vtbl;
+static zft_volinfo  eot_vtbl;
+static zft_volinfo *cur_vtbl;
 
 inline void zft_new_vtbl_entry(void)
 {
diff --git a/drivers/char/ftape/zftape/zftape-write.c b/drivers/char/ftape/zftape/zftape-write.c
index 03b126f49..8608c4dcc 100644
--- a/drivers/char/ftape/zftape/zftape-write.c
+++ b/drivers/char/ftape/zftape/zftape-write.c
@@ -48,8 +48,8 @@
 
 /*      Local vars.
  */
-static int last_write_failed = 0;
-static int need_flush = 0;
+static int last_write_failed;
+static int need_flush;
 
 void zft_prevent_flush(void)
 {