Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37ca35c4 authored by Shaun Laing's avatar Shaun Laing Committed by Greg Kroah-Hartman
Browse files

staging: cxt1e1: Remove #define SBE_INCLUDE_SYMBOLS 



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

drivers/staging/cxt1e1/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ obj-$(CONFIG_CXT1E1) += cxt1e1.o 


ccflags-y := -DSBE_PMCC4_ENABLE

ccflags-y += -DSBE_ISR_TASKLET

ccflags-y += -DSBE_INCLUDE_SYMBOLS



cxt1e1-y := 	\

  ossiRelease.o 	\

drivers/staging/cxt1e1/comet.c

+8 −15
Original line number Diff line number Diff line
@@ -22,22 +22,15 @@ 
#include "comet.h"

#include "comet_tables.h"



#ifdef SBE_INCLUDE_SYMBOLS

#define STATIC

#else

#define STATIC  static

#endif





extern int  cxt1e1_log_level;



#define COMET_NUM_SAMPLES   24  /* Number of entries in the waveform table */

#define COMET_NUM_UNITS     5   /* Number of points per entry in table */



/* forward references */

STATIC void SetPwrLevel(comet_t *comet);

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 SetPwrLevel(comet_t *comet);

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]);





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.

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

{

	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.

** Returns:     Nothing

*/

STATIC void

static void

WrtXmtWaveformTbl(ci_t *ci, comet_t *comet,

		  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.

*/



STATIC void

static void

WrtRcvEqualizerTbl(ci_t *ci, comet_t *comet, u_int32_t *table)

{

	u_int32_t   ramaddr;
@@ -516,7 +509,7 @@ WrtRcvEqualizerTbl(ci_t *ci, comet_t *comet, u_int32_t *table) 
** Returns:     Nothing

*/



STATIC void

static void

SetPwrLevel(comet_t *comet)

{

	volatile u_int32_t temp;
@@ -558,7 +551,7 @@ SetPwrLevel(comet_t *comet) 
** Returns:     Nothing

*/

#if 0

STATIC void

static void

SetCometOps(comet_t *comet)

{

	volatile u_int8_t rd_value;

drivers/staging/cxt1e1/functions.c

+1 −8
Original line number Diff line number Diff line
@@ -24,13 +24,6 @@ 
#include "libsbew.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) || \

    defined(CONFIG_SBE_HDLC_V7_MODULE) || defined(CONFIG_SBE_WAN256T3_HDLC_V7_MODULE)

#define _v7_hdlc_  1
@@ -111,7 +104,7 @@ pci_flush_write (ci_t *ci) 
}





STATIC void

static void

watchdog_func (unsigned long arg)

{

    struct watchdog *wd = (void *) arg;

drivers/staging/cxt1e1/hwprobe.c

+1 −7
Original line number Diff line number Diff line
@@ -31,12 +31,6 @@ 
#include "sbeproc.h"

#endif



#ifdef SBE_INCLUDE_SYMBOLS

#define STATIC

#else

#define STATIC  static

#endif



extern int  cxt1e1_log_level;

extern int  error_flag;

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)

{

    hdw_info_t *hi;

drivers/staging/cxt1e1/linux.c

+23 −29
Original line number Diff line number Diff line
@@ -52,12 +52,6 @@ 


/*****************************************************************************************/



#ifdef SBE_INCLUDE_SYMBOLS

#define STATIC

#else

#define STATIC  static

#endif



#define CHANNAME "hdlc"



/*******************************************************************/
@@ -285,7 +279,7 @@ void_open (struct net_device *ndev) 
}





STATIC int

static int

chan_open (struct net_device *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)

{

    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)

{

    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)

{

    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)

{

    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)

{

    const struct c4_priv *priv;
@@ -416,7 +410,7 @@ static const struct net_device_ops chan_ops = { 
       .ndo_get_stats  = chan_get_stats,

};



STATIC struct net_device *

static struct net_device *

create_chan (struct net_device *ndev, ci_t *ci,

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

STATIC      status_t

static      status_t

do_get_port (struct net_device *ndev, void *data)

{

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

STATIC      status_t

static      status_t

do_set_port (struct net_device *ndev, void *data)

{

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

STATIC      status_t

static      status_t

do_port_loop (struct net_device *ndev, void *data)

{

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

STATIC      status_t

static      status_t

do_framer_rw (struct net_device *ndev, void *data)

{

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

STATIC      status_t

static      status_t

do_pld_rw (struct net_device *ndev, void *data)

{

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

STATIC      status_t

static      status_t

do_musycc_rw (struct net_device *ndev, void *data)

{

    struct c4_musycc_param mp;
@@ -633,7 +627,7 @@ do_musycc_rw (struct net_device *ndev, void *data) 
    return 0;

}



STATIC      status_t

static      status_t

do_get_chan (struct net_device *ndev, void *data)

{

    struct sbecom_chan_param cp;
@@ -651,7 +645,7 @@ do_get_chan (struct net_device *ndev, void *data) 
    return 0;

}



STATIC      status_t

static      status_t

do_set_chan (struct net_device *ndev, void *data)

{

    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)

{

    ci_t       *ci;
@@ -699,7 +693,7 @@ do_create_chan (struct net_device *ndev, void *data) 
    return ret;

}



STATIC      status_t

static      status_t

do_get_chan_stats (struct net_device *ndev, void *data)

{

    struct c4_chan_stats_wrap ccs;
@@ -720,7 +714,7 @@ do_get_chan_stats (struct net_device *ndev, void *data) 
        return -EFAULT;

    return 0;

}

STATIC      status_t

static      status_t

do_set_loglevel (struct net_device *ndev, void *data)

{

    unsigned int cxt1e1_log_level;
@@ -731,7 +725,7 @@ do_set_loglevel (struct net_device *ndev, void *data) 
    return 0;

}



STATIC      status_t

static      status_t

do_deluser (struct net_device *ndev, int lockit)

{

    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));

}



STATIC      status_t

static      status_t

c4_ioctl (struct net_device *ndev, struct ifreq *ifr, int cmd)

{

    ci_t       *ci;
@@ -1102,7 +1096,7 @@ c4_add_dev (hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1, 
    return ndev;

}



STATIC int  __init

static int  __init

c4_mod_init (void)

{

    int         rtn;
@@ -1144,7 +1138,7 @@ c4_mod_init (void) 
  * do_deluser()

  */



STATIC void __exit

static void __exit

cleanup_hdlc (void)

{

    hdw_info_t *hi;
@@ -1168,7 +1162,7 @@ cleanup_hdlc (void) 
}





STATIC void __exit

static void __exit

c4_mod_remove (void)

{

	cleanup_hdlc();            /* delete any missed channels */