mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-12 03:26:26 +00:00
Code Issues Releases Wiki Activity

staging: cxt1e1: Remove #define SBE_INCLUDE_SYMBOLS

Browse source 
Removed the unneeded SBE_INCLUDE_SYMBOLS #define, and the associated STATIC
#define, and replaced all occurances of STATIC with 'static'.  This was in
response to sparse warnings of the form "symbol 'XYZ' was not declared. Should
it be static?".

Removed a function prototype (musycc_init_port) as adding the 'static'
declaration produced a new gcc warning. (musycc_init_port is only declared if
SBE_WAN256T3_ENABLE is set)

Signed-off-by: Shaun Laing <shaun@xresource.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Shaun Laing 2013-08-09 07:54:24 -06:00 committed by Greg Kroah-Hartman
parent a539c72a19
commit 37ca35c47b
9 changed files with 43 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/cxt1e1/Makefile
View file

@ -2,7 +2,6 @@ obj-$(CONFIG_CXT1E1) += cxt1e1.o
ccflags-y := -DSBE_PMCC4_ENABLE ccflags-y := -DSBE_PMCC4_ENABLE
ccflags-y += -DSBE_ISR_TASKLET ccflags-y += -DSBE_ISR_TASKLET
ccflags-y += -DSBE_INCLUDE_SYMBOLS
cxt1e1-y := \ cxt1e1-y := \
ossiRelease.o \ ossiRelease.o \

23
drivers/staging/cxt1e1/comet.c
View file

@ -22,22 +22,15 @@
#include "comet.h" #include "comet.h"
#include "comet_tables.h" #include "comet_tables.h"
#ifdef SBE_INCLUDE_SYMBOLS
#define STATIC
#else
#define STATIC static
#endif
extern int cxt1e1_log_level; extern int cxt1e1_log_level;
#define COMET_NUM_SAMPLES 24 /* Number of entries in the waveform table */ #define COMET_NUM_SAMPLES 24 /* Number of entries in the waveform table */
#define COMET_NUM_UNITS 5 /* Number of points per entry in table */ #define COMET_NUM_UNITS 5 /* Number of points per entry in table */
/* forward references */ /* forward references */
STATIC void SetPwrLevel(comet_t *comet); static void SetPwrLevel(comet_t *comet);
STATIC void WrtRcvEqualizerTbl(ci_t *ci, comet_t *comet, u_int32_t *table); static void WrtRcvEqualizerTbl(ci_t *ci, comet_t *comet, u_int32_t *table);
STATIC void WrtXmtWaveformTbl(ci_t *ci, comet_t *comet, u_int8_t table[COMET_NUM_SAMPLES][COMET_NUM_UNITS]); static void WrtXmtWaveformTbl(ci_t *ci, comet_t *comet, u_int8_t table[COMET_NUM_SAMPLES][COMET_NUM_UNITS]);
void *TWV_table[12] = { void *TWV_table[12] = {
@ -407,7 +400,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,
** Write the data to the Pulse Waveform Storage Data register. ** Write the data to the Pulse Waveform Storage Data register.
** Returns: Nothing ** Returns: Nothing
*/ */
STATIC void static void
WrtXmtWaveform(ci_t *ci, comet_t *comet, u_int32_t sample, u_int32_t unit, u_int8_t data) WrtXmtWaveform(ci_t *ci, comet_t *comet, u_int32_t sample, u_int32_t unit, u_int8_t data)
{ {
u_int8_t WaveformAddr; u_int8_t WaveformAddr;
@ -425,7 +418,7 @@ WrtXmtWaveform(ci_t *ci, comet_t *comet, u_int32_t sample, u_int32_t unit, u_int
** for driving the transmitter DAC. ** for driving the transmitter DAC.
** Returns: Nothing ** Returns: Nothing
*/ */
STATIC void static void
WrtXmtWaveformTbl(ci_t *ci, comet_t *comet, WrtXmtWaveformTbl(ci_t *ci, comet_t *comet,
u_int8_t table[COMET_NUM_SAMPLES][COMET_NUM_UNITS]) u_int8_t table[COMET_NUM_SAMPLES][COMET_NUM_UNITS])
{ {
@ -452,7 +445,7 @@ WrtXmtWaveformTbl(ci_t *ci, comet_t *comet,
** is coded with early setup of indirect address. ** is coded with early setup of indirect address.
*/ */
STATIC void static void
WrtRcvEqualizerTbl(ci_t *ci, comet_t *comet, u_int32_t *table) WrtRcvEqualizerTbl(ci_t *ci, comet_t *comet, u_int32_t *table)
{ {
u_int32_t ramaddr; u_int32_t ramaddr;
@ -516,7 +509,7 @@ WrtRcvEqualizerTbl(ci_t *ci, comet_t *comet, u_int32_t *table)
** Returns: Nothing ** Returns: Nothing
*/ */
STATIC void static void
SetPwrLevel(comet_t *comet) SetPwrLevel(comet_t *comet)
{ {
volatile u_int32_t temp; volatile u_int32_t temp;
@ -558,7 +551,7 @@ SetPwrLevel(comet_t *comet)
** Returns: Nothing ** Returns: Nothing
*/ */
#if 0 #if 0
STATIC void static void
SetCometOps(comet_t *comet) SetCometOps(comet_t *comet)
{ {
volatile u_int8_t rd_value; volatile u_int8_t rd_value;

9
drivers/staging/cxt1e1/functions.c
View file

@ -24,13 +24,6 @@
#include "libsbew.h" #include "libsbew.h"
#include "pmcc4.h" #include "pmcc4.h"
#ifdef SBE_INCLUDE_SYMBOLS
#define STATIC
#else
#define STATIC static
#endif
#if defined(CONFIG_SBE_HDLC_V7) || defined(CONFIG_SBE_WAN256T3_HDLC_V7) || \ #if defined(CONFIG_SBE_HDLC_V7) || defined(CONFIG_SBE_WAN256T3_HDLC_V7) || \
defined(CONFIG_SBE_HDLC_V7_MODULE) || defined(CONFIG_SBE_WAN256T3_HDLC_V7_MODULE) defined(CONFIG_SBE_HDLC_V7_MODULE) || defined(CONFIG_SBE_WAN256T3_HDLC_V7_MODULE)
#define _v7_hdlc_ 1 #define _v7_hdlc_ 1
@ -111,7 +104,7 @@ pci_flush_write (ci_t *ci)
} }
STATIC void static void
watchdog_func (unsigned long arg) watchdog_func (unsigned long arg)
{ {
struct watchdog *wd = (void *) arg; struct watchdog *wd = (void *) arg;

8
drivers/staging/cxt1e1/hwprobe.c
View file

@ -31,12 +31,6 @@
#include "sbeproc.h" #include "sbeproc.h"
#endif #endif
#ifdef SBE_INCLUDE_SYMBOLS
#define STATIC
#else
#define STATIC static
#endif
extern int cxt1e1_log_level; extern int cxt1e1_log_level;
extern int error_flag; extern int error_flag;
extern int drvr_state; extern int drvr_state;
@ -221,7 +215,7 @@ cleanup_devs (void)
} }
STATIC int __init static int __init
c4_hdw_init (struct pci_dev *pdev, int found) c4_hdw_init (struct pci_dev *pdev, int found)
{ {
hdw_info_t *hi; hdw_info_t *hi;

52
drivers/staging/cxt1e1/linux.c
View file

@ -52,12 +52,6 @@
/*****************************************************************************************/ /*****************************************************************************************/
#ifdef SBE_INCLUDE_SYMBOLS
#define STATIC
#else
#define STATIC static
#endif
#define CHANNAME "hdlc" #define CHANNAME "hdlc"
/*******************************************************************/ /*******************************************************************/
@ -285,7 +279,7 @@ void_open (struct net_device *ndev)
} }
STATIC int static int
chan_open (struct net_device *ndev) chan_open (struct net_device *ndev)
{ {
hdlc_device *hdlc = dev_to_hdlc (ndev); hdlc_device *hdlc = dev_to_hdlc (ndev);
@ -305,7 +299,7 @@ chan_open (struct net_device *ndev)
} }
STATIC int static int
chan_close (struct net_device *ndev) chan_close (struct net_device *ndev)
{ {
hdlc_device *hdlc = dev_to_hdlc (ndev); hdlc_device *hdlc = dev_to_hdlc (ndev);
@ -319,14 +313,14 @@ chan_close (struct net_device *ndev)
} }
STATIC int static int
chan_dev_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) chan_dev_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
{ {
return hdlc_ioctl (dev, ifr, cmd); return hdlc_ioctl (dev, ifr, cmd);
} }
STATIC int static int
chan_attach_noop (struct net_device *ndev, unsigned short foo_1, unsigned short foo_2) chan_attach_noop (struct net_device *ndev, unsigned short foo_1, unsigned short foo_2)
{ {
return 0; /* our driver has nothing to do here, show's return 0; /* our driver has nothing to do here, show's
@ -334,7 +328,7 @@ chan_attach_noop (struct net_device *ndev, unsigned short foo_1, unsigned short
} }
STATIC struct net_device_stats * static struct net_device_stats *
chan_get_stats (struct net_device *ndev) chan_get_stats (struct net_device *ndev)
{ {
mch_t *ch; mch_t *ch;
@ -394,7 +388,7 @@ get_ci_by_dev (struct net_device *ndev)
} }
STATIC int static int
c4_linux_xmit (struct sk_buff *skb, struct net_device *ndev) c4_linux_xmit (struct sk_buff *skb, struct net_device *ndev)
{ {
const struct c4_priv *priv; const struct c4_priv *priv;
@ -416,7 +410,7 @@ static const struct net_device_ops chan_ops = {
.ndo_get_stats = chan_get_stats, .ndo_get_stats = chan_get_stats,
}; };
STATIC struct net_device * static struct net_device *
create_chan (struct net_device *ndev, ci_t *ci, create_chan (struct net_device *ndev, ci_t *ci,
struct sbecom_chan_param *cp) struct sbecom_chan_param *cp)
{ {
@ -509,7 +503,7 @@ create_chan (struct net_device *ndev, ci_t *ci,
/* the idea here is to get port information and pass it back (using pointer) */ /* the idea here is to get port information and pass it back (using pointer) */
STATIC status_t static status_t
do_get_port (struct net_device *ndev, void *data) do_get_port (struct net_device *ndev, void *data)
{ {
int ret; int ret;
@ -534,7 +528,7 @@ do_get_port (struct net_device *ndev, void *data)
} }
/* this function copys the user data and then calls the real action function */ /* this function copys the user data and then calls the real action function */
STATIC status_t static status_t
do_set_port (struct net_device *ndev, void *data) do_set_port (struct net_device *ndev, void *data)
{ {
ci_t *ci; /* ci stands for card information */ ci_t *ci; /* ci stands for card information */
@ -556,7 +550,7 @@ do_set_port (struct net_device *ndev, void *data)
} }
/* work the port loopback mode as per directed */ /* work the port loopback mode as per directed */
STATIC status_t static status_t
do_port_loop (struct net_device *ndev, void *data) do_port_loop (struct net_device *ndev, void *data)
{ {
struct sbecom_port_param pp; struct sbecom_port_param pp;
@ -571,7 +565,7 @@ do_port_loop (struct net_device *ndev, void *data)
} }
/* set the specified register with the given value / or just read it */ /* set the specified register with the given value / or just read it */
STATIC status_t static status_t
do_framer_rw (struct net_device *ndev, void *data) do_framer_rw (struct net_device *ndev, void *data)
{ {
struct sbecom_port_param pp; struct sbecom_port_param pp;
@ -592,7 +586,7 @@ do_framer_rw (struct net_device *ndev, void *data)
} }
/* set the specified register with the given value / or just read it */ /* set the specified register with the given value / or just read it */
STATIC status_t static status_t
do_pld_rw (struct net_device *ndev, void *data) do_pld_rw (struct net_device *ndev, void *data)
{ {
struct sbecom_port_param pp; struct sbecom_port_param pp;
@ -613,7 +607,7 @@ do_pld_rw (struct net_device *ndev, void *data)
} }
/* set the specified register with the given value / or just read it */ /* set the specified register with the given value / or just read it */
STATIC status_t static status_t
do_musycc_rw (struct net_device *ndev, void *data) do_musycc_rw (struct net_device *ndev, void *data)
{ {
struct c4_musycc_param mp; struct c4_musycc_param mp;
@ -633,7 +627,7 @@ do_musycc_rw (struct net_device *ndev, void *data)
return 0; return 0;
} }
STATIC status_t static status_t
do_get_chan (struct net_device *ndev, void *data) do_get_chan (struct net_device *ndev, void *data)
{ {
struct sbecom_chan_param cp; struct sbecom_chan_param cp;
@ -651,7 +645,7 @@ do_get_chan (struct net_device *ndev, void *data)
return 0; return 0;
} }
STATIC status_t static status_t
do_set_chan (struct net_device *ndev, void *data) do_set_chan (struct net_device *ndev, void *data)
{ {
struct sbecom_chan_param cp; struct sbecom_chan_param cp;
@ -672,7 +666,7 @@ do_set_chan (struct net_device *ndev, void *data)
} }
} }
STATIC status_t static status_t
do_create_chan (struct net_device *ndev, void *data) do_create_chan (struct net_device *ndev, void *data)
{ {
ci_t *ci; ci_t *ci;
@ -699,7 +693,7 @@ do_create_chan (struct net_device *ndev, void *data)
return ret; return ret;
} }
STATIC status_t static status_t
do_get_chan_stats (struct net_device *ndev, void *data) do_get_chan_stats (struct net_device *ndev, void *data)
{ {
struct c4_chan_stats_wrap ccs; struct c4_chan_stats_wrap ccs;
@ -720,7 +714,7 @@ do_get_chan_stats (struct net_device *ndev, void *data)
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
STATIC status_t static status_t
do_set_loglevel (struct net_device *ndev, void *data) do_set_loglevel (struct net_device *ndev, void *data)
{ {
unsigned int cxt1e1_log_level; unsigned int cxt1e1_log_level;
@ -731,7 +725,7 @@ do_set_loglevel (struct net_device *ndev, void *data)
return 0; return 0;
} }
STATIC status_t static status_t
do_deluser (struct net_device *ndev, int lockit) do_deluser (struct net_device *ndev, int lockit)
{ {
if (ndev->flags & IFF_UP) if (ndev->flags & IFF_UP)
@ -826,7 +820,7 @@ do_reset_chan_stats (struct net_device *musycc_dev, void *data)
return mkret (c4_del_chan_stats (cp.channum)); return mkret (c4_del_chan_stats (cp.channum));
} }
STATIC status_t static status_t
c4_ioctl (struct net_device *ndev, struct ifreq *ifr, int cmd) c4_ioctl (struct net_device *ndev, struct ifreq *ifr, int cmd)
{ {
ci_t *ci; ci_t *ci;
@ -1102,7 +1096,7 @@ c4_add_dev (hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1,
return ndev; return ndev;
} }
STATIC int __init static int __init
c4_mod_init (void) c4_mod_init (void)
{ {
int rtn; int rtn;
@ -1144,7 +1138,7 @@ c4_mod_init (void)
* do_deluser() * do_deluser()
*/ */
STATIC void __exit static void __exit
cleanup_hdlc (void) cleanup_hdlc (void)
{ {
hdw_info_t *hi; hdw_info_t *hi;
@ -1168,7 +1162,7 @@ cleanup_hdlc (void)
} }
STATIC void __exit static void __exit
c4_mod_remove (void) c4_mod_remove (void)
{ {
cleanup_hdlc(); /* delete any missed channels */ cleanup_hdlc(); /* delete any missed channels */

15
drivers/staging/cxt1e1/musycc.c
View file

@ -35,12 +35,6 @@ unsigned int max_bh = 0;
#include "pmcc4.h" #include "pmcc4.h"
#include "musycc.h" #include "musycc.h"
#ifdef SBE_INCLUDE_SYMBOLS
#define STATIC
#else
#define STATIC static
#endif
#define sd_find_chan(ci,ch) c4_find_chan(ch) #define sd_find_chan(ci,ch) c4_find_chan(ch)
@ -65,7 +59,6 @@ void c4_wk_chan_restart(mch_t *);
void musycc_bh_tx_eom(mpi_t *, int); void musycc_bh_tx_eom(mpi_t *, int);
int musycc_chan_up(ci_t *, int); int musycc_chan_up(ci_t *, int);
status_t __init musycc_init(ci_t *); status_t __init musycc_init(ci_t *);
STATIC void __init musycc_init_port(mpi_t *);
void musycc_intr_bh_tasklet(ci_t *); void musycc_intr_bh_tasklet(ci_t *);
void musycc_serv_req(mpi_t *, u_int32_t); void musycc_serv_req(mpi_t *, u_int32_t);
void musycc_update_timeslots(mpi_t *); void musycc_update_timeslots(mpi_t *);
@ -73,7 +66,7 @@ void musycc_update_timeslots(mpi_t *);
/*******************************************************************/ /*******************************************************************/
#if 1 #if 1
STATIC int static int
musycc_dump_rxbuffer_ring(mch_t *ch, int lockit) musycc_dump_rxbuffer_ring(mch_t *ch, int lockit)
{ {
struct mdesc *m; struct mdesc *m;
@ -139,7 +132,7 @@ musycc_dump_rxbuffer_ring(mch_t *ch, int lockit)
#endif #endif
#if 1 #if 1
STATIC int static int
musycc_dump_txbuffer_ring(mch_t *ch, int lockit) musycc_dump_txbuffer_ring(mch_t *ch, int lockit)
{ {
struct mdesc *m; struct mdesc *m;
@ -702,7 +695,7 @@ musycc_chan_proto(int proto)
} }
#ifdef SBE_WAN256T3_ENABLE #ifdef SBE_WAN256T3_ENABLE
STATIC void __init static void __init
musycc_init_port(mpi_t *pi) musycc_init_port(mpi_t *pi)
{ {
pci_write_32((u_int32_t *) &pi->reg->gbp, OS_vtophys(pi->regram)); pci_write_32((u_int32_t *) &pi->reg->gbp, OS_vtophys(pi->regram));
@ -1009,7 +1002,7 @@ musycc_bh_tx_eom(mpi_t *pi, int gchan)
} }
STATIC void static void
musycc_bh_rx_eom(mpi_t *pi, int gchan) musycc_bh_rx_eom(mpi_t *pi, int gchan)
{ {
mch_t *ch; mch_t *ch;

15
drivers/staging/cxt1e1/pmc93x6_eeprom.c
View file

@ -34,13 +34,6 @@
#define FALSE 0 #define FALSE 0
#endif #endif
#ifdef SBE_INCLUDE_SYMBOLS
#define STATIC
#else
#define STATIC static
#endif
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
* EEPROM address definitions * EEPROM address definitions
*------------------------------------------------------------------------ *------------------------------------------------------------------------
@ -120,7 +113,7 @@ short mfg_template[sizeof (FLD_TYPE2)] =
* (the MSB becomes the LSB etc.). * (the MSB becomes the LSB etc.).
*/ */
STATIC void static void
BuildByteReverse (void) BuildByteReverse (void)
{ {
long half; /* Used to build by powers to 2 */ long half; /* Used to build by powers to 2 */
@ -141,7 +134,7 @@ BuildByteReverse (void)
*------------------------------------------------------------------------ *------------------------------------------------------------------------
*/ */
STATIC void static void
eeprom_delay (void) eeprom_delay (void)
{ {
int timeout; int timeout;
@ -224,7 +217,7 @@ eeprom_get_byte (long addr)
* Issue the EEPROM command to disable writes. * Issue the EEPROM command to disable writes.
*/ */
STATIC void static void
disable_pmc_eeprom (long addr) disable_pmc_eeprom (long addr)
{ {
eeprom_put_byte (addr, EPROM_EWDS, SIZE_ADDR_OP); eeprom_put_byte (addr, EPROM_EWDS, SIZE_ADDR_OP);
@ -241,7 +234,7 @@ disable_pmc_eeprom (long addr)
* Issue the EEPROM command to enable writes. * Issue the EEPROM command to enable writes.
*/ */
STATIC void static void
enable_pmc_eeprom (long addr) enable_pmc_eeprom (long addr)
{ {
eeprom_put_byte (addr, EPROM_EWEN, SIZE_ADDR_OP); eeprom_put_byte (addr, EPROM_EWEN, SIZE_ADDR_OP);

11
drivers/staging/cxt1e1/pmcc4_drv.c
View file

@ -39,13 +39,6 @@
#include "comet.h" #include "comet.h"
#include "sbe_bid.h" #include "sbe_bid.h"
#ifdef SBE_INCLUDE_SYMBOLS
#define STATIC
#else
#define STATIC static
#endif
#define KERN_WARN KERN_WARNING #define KERN_WARN KERN_WARNING
/* forward references */ /* forward references */
@ -458,7 +451,7 @@ checkPorts (ci_t *ci)
} }
STATIC void static void
c4_watchdog (ci_t *ci) c4_watchdog (ci_t *ci)
{ {
if (drvr_state != SBE_DRVR_AVAILABLE) if (drvr_state != SBE_DRVR_AVAILABLE)
@ -1184,7 +1177,7 @@ c4_get_chan_stats (int channum, struct sbecom_chan_stats *p)
return 0; return 0;
} }
STATIC int static int
c4_fifo_alloc (mpi_t *pi, int chan, int *len) c4_fifo_alloc (mpi_t *pi, int chan, int *len)
{ {
int i, l = 0, start = 0, max = 0, maxstart = 0; int i, l = 0, start = 0, max = 0, maxstart = 0;

7
drivers/staging/cxt1e1/sbeid.c
View file

@ -19,13 +19,6 @@
#include "pmcc4.h" #include "pmcc4.h"
#include "sbe_bid.h" #include "sbe_bid.h"
#ifdef SBE_INCLUDE_SYMBOLS
#define STATIC
#else
#define STATIC static
#endif
char * char *
sbeid_get_bdname (ci_t *ci) sbeid_get_bdname (ci_t *ci)
{ {