staging: cxt1e1: removed version string declaration

Removed the unneeded pmcc4_OSSI_release version string, as well as the now
unused 'release' element of the sbe_card_info struct.  This also resolves a
sparse "should it be static" warning.

Signed-off-by: Shaun Laing <shaun@xresource.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/cxt1e1/Makefile b/drivers/staging/cxt1e1/Makefile
index 2f217e9daac11cfccef0abf9a4be211ea1bb7902..b879e7b553c266fa83bce314af45c5d7d93770f2 100644 (file)
--- a/drivers/staging/cxt1e1/Makefile
+++ b/drivers/staging/cxt1e1/Makefile
@@ -4,7 +4,6 @@ ccflags-y := -DSBE_PMCC4_ENABLE
 ccflags-y += -DSBE_ISR_TASKLET
 
 cxt1e1-y :=    \
-  ossiRelease.o        \
   musycc.o             \
   pmcc4_drv.o          \
   comet.o              \

diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c
index 579e68e3deced66c7314b85009bc1b519c9379a5..2924c39781a1b5076e870bd9062f1d39c6e5cff6 100644 (file)
--- a/drivers/staging/cxt1e1/linux.c
+++ b/drivers/staging/cxt1e1/linux.c
@@ -81,7 +81,6 @@ status_t    musycc_chan_down(ci_t *, int);
 irqreturn_t musycc_intr_th_handler(void *);
 int         musycc_start_xmit(ci_t *, int, void *);
 
-extern char pmcc4_OSSI_release[];
 extern ci_t *CI;
 extern struct s_hdw_info hdw_info[];
 
@@ -990,7 +989,6 @@ c4_add_dev(hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1,
                CI = ci;                    /* DEBUG, only board 0 usage */
 
        strcpy(ci->devname, hi->devname);
-       ci->release = &pmcc4_OSSI_release[0];
 
        /* tasklet */
 #if defined(SBE_ISR_TASKLET)
@@ -1122,7 +1120,6 @@ c4_mod_init(void)
 {
        int         rtn;
 
-       pr_warning("%s\n", pmcc4_OSSI_release);
        if ((rtn = c4hw_attach_all()))
                return -rtn; /* installation failure - see system log */
 

diff --git a/drivers/staging/cxt1e1/ossiRelease.c b/drivers/staging/cxt1e1/ossiRelease.c
deleted file mode 100644 (file)
index f17a902..0000000
--- a/drivers/staging/cxt1e1/ossiRelease.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-----------------------------------------------------------------------------
- * ossiRelease.c -
- *
- * This string will be embedded into the executable and will track the
- * release.  The embedded string may be displayed using the following:
- *
- *      strings <filename> | grep \$Rel
- *
- * Copyright (C) 2002-2008  One Stop Systems, Inc.
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- * For further information, contact via email: support@onestopsystems.com
- * One Stop Systems, Inc.  Escondido, California  U.S.A.
- *
- *-----------------------------------------------------------------------------
- */
-
-char pmcc4_OSSI_release[] = "$Release: PMCC4_3_1B,  Copyright (c) 2008 One Stop Systems$";
-
-/***  End-of-File  ***/

diff --git a/drivers/staging/cxt1e1/pmcc4_private.h b/drivers/staging/cxt1e1/pmcc4_private.h
index 7edbd4e492e39a62faa01dfd4751ece463818c0e..eb28f095ff8c29c840d149165687b5e5037c0872 100644 (file)
--- a/drivers/staging/cxt1e1/pmcc4_private.h
+++ b/drivers/staging/cxt1e1/pmcc4_private.h
@@ -213,7 +213,6 @@ struct sbe_card_info
     struct sbe_card_info *next;
     u_int32_t  *eeprombase;     /* mapped address of board's EEPROM */
     c4cpld_t   *cpldbase;       /* mapped address of board's CPLD hardware */
-    char       *release;        /* SBE ID string w/in sbeRelease.c */
     void       *hdw_info;
 #ifdef CONFIG_PROC_FS
     struct proc_dir_entry *dir_dev;

diff --git a/drivers/staging/cxt1e1/sbeproc.c b/drivers/staging/cxt1e1/sbeproc.c
index 353c001d3fbeec2f7f836c131a1181a2b3a9bf82..e08f79b63f1be6ca3f2e859461f75279f5581041 100644 (file)
--- a/drivers/staging/cxt1e1/sbeproc.c
+++ b/drivers/staging/cxt1e1/sbeproc.c
@@ -150,7 +150,6 @@ static int sbecom_proc_get_sbe_info(struct seq_file *m, void *v)
                break;
        }
        seq_printf(m, "PCI Bus Speed: %s\n", spd);
-       seq_printf(m, "Release:       %s\n", ci->release);
 
 #ifdef SBE_PMCC4_ENABLE
        {