Commit 987e8bef authored by Sima Baymani's avatar Sima Baymani Committed by Greg Kroah-Hartman
Browse files

staging: cxt1e1: remove typedef comet_t 



Remove typedef declaration per checkpatch warning.
Built and loaded.

Signed-off-by: default avatarSima Baymani <sima.baymani@gmail.com>
Reviewed-by: default avatarLisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af259440

drivers/staging/cxt1e1/comet.c

+9 −9
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ extern int cxt1e1_log_level; 
#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(struct s_comet_reg *comet);

static void WrtRcvEqualizerTbl(ci_t *ci, struct s_comet_reg *comet, u_int32_t *table);

static void WrtXmtWaveformTbl(ci_t *ci, struct s_comet_reg *comet, u_int8_t table[COMET_NUM_SAMPLES][COMET_NUM_UNITS]);





void       *TWV_table[12] = {
@@ -58,7 +58,7 @@ lbo_tbl_lkup(int t1, int lbo) { 
	return lbo - 1;

}



void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,

void init_comet(void *ci, struct s_comet_reg *comet, u_int32_t port_mode, int clockmaster,

		u_int8_t moreParams)

{

	u_int8_t isT1mode;
@@ -396,7 +396,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster, 
** Returns:     Nothing

*/

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, struct s_comet_reg *comet, u_int32_t sample, u_int32_t unit, u_int8_t data)

{

	u_int8_t    WaveformAddr;
@@ -414,7 +414,7 @@ WrtXmtWaveform(ci_t *ci, comet_t *comet, u_int32_t sample, u_int32_t unit, u_int 
** Returns:     Nothing

*/

static void

WrtXmtWaveformTbl(ci_t *ci, comet_t *comet,

WrtXmtWaveformTbl(ci_t *ci, struct s_comet_reg *comet,

		  u_int8_t table[COMET_NUM_SAMPLES][COMET_NUM_UNITS])

{

	u_int32_t sample, unit;
@@ -440,7 +440,7 @@ WrtXmtWaveformTbl(ci_t *ci, comet_t *comet, 
*/



static void

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

WrtRcvEqualizerTbl(ci_t *ci, struct s_comet_reg *comet, u_int32_t *table)

{

	u_int32_t   ramaddr;

	volatile u_int32_t value;
@@ -504,7 +504,7 @@ WrtRcvEqualizerTbl(ci_t *ci, comet_t *comet, u_int32_t *table) 
*/



static void

SetPwrLevel(comet_t *comet)

SetPwrLevel(struct s_comet_reg *comet)

{

	volatile u_int32_t temp;
@@ -546,7 +546,7 @@ SetPwrLevel(comet_t *comet) 
*/

#if 0

static void

SetCometOps(comet_t *comet)

SetCometOps(struct s_comet_reg *comet)

{

	volatile u_int8_t rd_value;

drivers/staging/cxt1e1/comet.h

+1 −3
Original line number Diff line number Diff line
@@ -332,8 +332,6 @@ struct s_comet_reg { 
	VINT32 rlps_eq_cfg;      /* FF  RLPS Equalizer Cfg */

};



typedef struct s_comet_reg comet_t;



/* 00AH: MDIAG Register bit definitions */

#define COMET_MDIAG_ID5        0x40

#define COMET_MDIAG_LBMASK     0x3F
@@ -349,7 +347,7 @@ typedef struct s_comet_reg comet_t; 


#ifdef __KERNEL__

extern void

init_comet(void *, comet_t *, u_int32_t, int, u_int8_t);

init_comet(void *, struct s_comet_reg *, u_int32_t, int, u_int8_t);

#endif



#endif                          /* _INC_COMET_H_ */

drivers/staging/cxt1e1/functions.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ VMETRO_TRACE (void *x) 
void

VMETRO_TRIGGER (ci_t *ci, int x)

{

    comet_t    *comet;

    struct s_comet_reg    *comet;

    volatile u_int32_t data;



    comet = ci->port[0].cometbase;  /* default to COMET # 0 */

drivers/staging/cxt1e1/pmcc4_drv.c

+5 −5
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ checkPorts (ci_t *ci) 
     * alarms conflicts with NCOMM's interrupt servicing implementation.

     */



    comet_t    *comet;

    struct s_comet_reg    *comet;

    volatile u_int32_t value;

    u_int32_t   copyVal, LEDval;
@@ -507,7 +507,7 @@ c4_cleanup (void) 
int

c4_get_portcfg (ci_t *ci)

{

    comet_t    *comet;

    struct s_comet_reg    *comet;

    int         portnum, mask;

    u_int32_t   wdata, rdata;
@@ -561,7 +561,7 @@ c4_init (ci_t *ci, u_char *func0, u_char *func1) 
        for (portnum = 0; portnum < MUSYCC_NPORTS; portnum++)

        {

            pi = &ci->port[portnum];

            pi->cometbase = (comet_t *) ((u_int32_t *) (func1 + COMET_OFFSET (portnum)));

            pi->cometbase = (struct s_comet_reg *) ((u_int32_t *) (func1 + COMET_OFFSET (portnum)));

            pi->reg = (struct musycc_globalr *) ((u_char *) ci->reg + (portnum * 0x800));

            pi->portnum = portnum;

            pi->p.portnum = portnum;
@@ -693,7 +693,7 @@ c4_init2 (ci_t *ci) 
int

c4_loop_port (ci_t *ci, int portnum, u_int8_t cmd)

{

    comet_t    *comet;

    struct s_comet_reg    *comet;

    volatile u_int32_t loopValue;



    comet = ci->port[portnum].cometbase;
@@ -752,7 +752,7 @@ c4_loop_port (ci_t *ci, int portnum, u_int8_t cmd) 
status_t

c4_frame_rw (ci_t *ci, struct sbecom_port_param *pp)

{

    comet_t    *comet;

    struct s_comet_reg    *comet;

    volatile u_int32_t data;



    if (pp->portnum >= ci->max_port)/* sanity check */

drivers/staging/cxt1e1/pmcc4_private.h

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ struct c4_port_info 
    void       *regram_saved;   /* Original malloc value may have non-2KB

                                 * boundary.  Need to save for use when

                                 * freeing. */

    comet_t    *cometbase;

    struct s_comet_reg    *cometbase;

    struct sbe_card_info *up;



    /*