Commit 1fa21a79 authored by Shaun Laing's avatar Shaun Laing Committed by Greg Kroah-Hartman
Browse files

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: default avatarShaun Laing <shaun@xresource.ca>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b16aad35

drivers/staging/cxt1e1/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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 		\

drivers/staging/cxt1e1/linux.c

+0 −3
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/cxt1e1/ossiRelease.c

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*-----------------------------------------------------------------------------

 * 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  ***/

drivers/staging/cxt1e1/pmcc4_private.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/cxt1e1/sbeproc.c

+0 −1
Original line number Diff line number Diff line
@@ -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

	{