From ee1803cf20923b019d24d265f37b3d6897fc4a74 Mon Sep 17 00:00:00 2001 From: Dulshani Gunawardhana Date: Wed, 22 May 2013 23:29:26 +0530 Subject: [PATCH] Staging/cxt1e1:Fixing foo * bar should be foo *bar This patch fixes the variable naming error foo * bar should be foo *bar. Signed-off-by: Dulshani Gunawardhana Signed-off-by: Greg Kroah-Hartman --- drivers/staging/cxt1e1/comet.c | 22 +++---- drivers/staging/cxt1e1/functions.c | 4 +- drivers/staging/cxt1e1/hwprobe.c | 6 +- drivers/staging/cxt1e1/linux.c | 64 ++++++++++---------- drivers/staging/cxt1e1/musycc.c | 42 ++++++------- drivers/staging/cxt1e1/pmcc4.h | 10 +-- drivers/staging/cxt1e1/pmcc4_drv.c | 44 +++++++------- drivers/staging/cxt1e1/sbecom_inline_linux.h | 6 +- drivers/staging/cxt1e1/sbeid.c | 6 +- drivers/staging/cxt1e1/sbeproc.h | 4 +- 10 files changed, 104 insertions(+), 104 deletions(-) diff --git a/drivers/staging/cxt1e1/comet.c b/drivers/staging/cxt1e1/comet.c index 0af71cdb571d..a3da24d89219 100644 --- a/drivers/staging/cxt1e1/comet.c +++ b/drivers/staging/cxt1e1/comet.c @@ -35,9 +35,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(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] = { @@ -65,7 +65,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, comet_t *comet, u_int32_t port_mode, int clockmaster, u_int8_t moreParams) { u_int8_t isT1mode; @@ -408,9 +408,9 @@ 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, comet_t *comet, u_int32_t sample, u_int32_t unit, u_int8_t data) { - WaveformAddr; + u_int8_t WaveformAddr; WaveformAddr = (sample << 3) + (unit & 7); pci_write_32((u_int32_t *) &comet->xlpg_pwave_addr, WaveformAddr); @@ -426,7 +426,7 @@ WrtXmtWaveform(ci_t * ci, comet_t * comet, u_int32_t sample, u_int32_t unit, u_i ** Returns: Nothing */ 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_int32_t sample, unit; @@ -453,7 +453,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, comet_t *comet, u_int32_t *table) { u_int32_t ramaddr; volatile u_int32_t value; @@ -502,7 +502,7 @@ WrtRcvEqualizerTbl(ci_t * ci, comet_t * comet, u_int32_t *table) * by T1/E1 clock */ /* 683ns * 3 = 1366 ns, approx 2us (but use 4us) */ - OS_uwait(4, "wret") + OS_uwait(4, "wret"); } /* Enable Equalizer & set it to use 256 periods */ @@ -517,7 +517,7 @@ WrtRcvEqualizerTbl(ci_t * ci, comet_t * comet, u_int32_t *table) */ STATIC void -SetPwrLevel(comet_t * comet) +SetPwrLevel(comet_t *comet) { volatile u_int32_t temp; @@ -559,7 +559,7 @@ SetPwrLevel(comet_t * comet) */ #if 0 STATIC void -SetCometOps(comet_t * comet) +SetCometOps(comet_t *comet) { volatile u_int8_t rd_value; diff --git a/drivers/staging/cxt1e1/functions.c b/drivers/staging/cxt1e1/functions.c index 449ae7a93893..1f2876f362d2 100644 --- a/drivers/staging/cxt1e1/functions.c +++ b/drivers/staging/cxt1e1/functions.c @@ -97,7 +97,7 @@ pci_write_32 (u_int32_t *p, u_int32_t v) void -pci_flush_write (ci_t * ci) +pci_flush_write (ci_t *ci) { volatile u_int32_t v; @@ -279,7 +279,7 @@ VMETRO_TRACE (void *x) void -VMETRO_TRIGGER (ci_t * ci, int x) +VMETRO_TRIGGER (ci_t *ci, int x) { comet_t *comet; volatile u_int32_t data; diff --git a/drivers/staging/cxt1e1/hwprobe.c b/drivers/staging/cxt1e1/hwprobe.c index de8ac0bc24fb..110c252d38d7 100644 --- a/drivers/staging/cxt1e1/hwprobe.c +++ b/drivers/staging/cxt1e1/hwprobe.c @@ -50,7 +50,7 @@ struct s_hdw_info hdw_info[MAX_BOARDS]; void __init -show_two (hdw_info_t * hi, int brdno) +show_two (hdw_info_t *hi, int brdno) { ci_t *ci; struct pci_dev *pdev; @@ -102,7 +102,7 @@ show_two (hdw_info_t * hi, int brdno) void __init -hdw_sn_get (hdw_info_t * hi, int brdno) +hdw_sn_get (hdw_info_t *hi, int brdno) { /* obtain hardware EEPROM information */ long addr; @@ -222,7 +222,7 @@ cleanup_devs (void) 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; int i; diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c index a829b6231a66..e5889ef190a2 100644 --- a/drivers/staging/cxt1e1/linux.c +++ b/drivers/staging/cxt1e1/linux.c @@ -144,7 +144,7 @@ getuserbychan (int channum) char * -get_hdlc_name (hdlc_device * hdlc) +get_hdlc_name (hdlc_device *hdlc) { struct c4_priv *priv = hdlc->priv; struct net_device *dev = getuserbychan (priv->channum); @@ -185,7 +185,7 @@ mkret (int bsd) * within a port's group. */ void -c4_wk_chan_restart (mch_t * ch) +c4_wk_chan_restart (mch_t *ch) { mpi_t *pi = ch->up; @@ -203,7 +203,7 @@ c4_wk_chan_restart (mch_t * ch) } status_t -c4_wk_chan_init (mpi_t * pi, mch_t * ch) +c4_wk_chan_init (mpi_t *pi, mch_t *ch) { /* * this will be used to restart a stopped channel @@ -218,7 +218,7 @@ c4_wk_chan_init (mpi_t * pi, mch_t * ch) } status_t -c4_wq_port_init (mpi_t * pi) +c4_wq_port_init (mpi_t *pi) { char name[16], *np; /* NOTE: name of the queue limited by system @@ -241,7 +241,7 @@ c4_wq_port_init (mpi_t * pi) } void -c4_wq_port_cleanup (mpi_t * pi) +c4_wq_port_cleanup (mpi_t *pi) { /* * PORT POINT: cannot call this if WQ is statically allocated w/in @@ -278,7 +278,7 @@ c4_ebus_interrupt (int irq, void *dev_instance) static int -void_open (struct net_device * ndev) +void_open (struct net_device *ndev) { pr_info("%s: trying to open master device !\n", ndev->name); return -1; @@ -286,7 +286,7 @@ void_open (struct net_device * ndev) STATIC int -chan_open (struct net_device * ndev) +chan_open (struct net_device *ndev) { hdlc_device *hdlc = dev_to_hdlc (ndev); const struct c4_priv *priv = hdlc->priv; @@ -306,7 +306,7 @@ chan_open (struct net_device * ndev) STATIC int -chan_close (struct net_device * ndev) +chan_close (struct net_device *ndev) { hdlc_device *hdlc = dev_to_hdlc (ndev); const struct c4_priv *priv = hdlc->priv; @@ -320,14 +320,14 @@ chan_close (struct net_device * ndev) 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); } 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 * over, go home */ @@ -335,7 +335,7 @@ chan_attach_noop (struct net_device * ndev, unsigned short foo_1, unsigned short STATIC struct net_device_stats * -chan_get_stats (struct net_device * ndev) +chan_get_stats (struct net_device *ndev) { mch_t *ch; struct net_device_stats *nstats; @@ -388,14 +388,14 @@ chan_get_stats (struct net_device * ndev) static ci_t * -get_ci_by_dev (struct net_device * ndev) +get_ci_by_dev (struct net_device *ndev) { return (ci_t *)(netdev_priv(ndev)); } 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; int rval; @@ -417,8 +417,8 @@ static const struct net_device_ops chan_ops = { }; STATIC struct net_device * -create_chan (struct net_device * ndev, ci_t * ci, - struct sbecom_chan_param * cp) +create_chan (struct net_device *ndev, ci_t *ci, + struct sbecom_chan_param *cp) { hdlc_device *hdlc; struct net_device *dev; @@ -510,7 +510,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 -do_get_port (struct net_device * ndev, void *data) +do_get_port (struct net_device *ndev, void *data) { int ret; ci_t *ci; /* ci stands for card information */ @@ -535,7 +535,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 -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 */ struct sbecom_port_param pp;/* copy data to kernel land */ @@ -557,7 +557,7 @@ do_set_port (struct net_device * ndev, void *data) /* work the port loopback mode as per directed */ 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; ci_t *ci; @@ -572,7 +572,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 -do_framer_rw (struct net_device * ndev, void *data) +do_framer_rw (struct net_device *ndev, void *data) { struct sbecom_port_param pp; ci_t *ci; @@ -593,7 +593,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 -do_pld_rw (struct net_device * ndev, void *data) +do_pld_rw (struct net_device *ndev, void *data) { struct sbecom_port_param pp; ci_t *ci; @@ -614,7 +614,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 -do_musycc_rw (struct net_device * ndev, void *data) +do_musycc_rw (struct net_device *ndev, void *data) { struct c4_musycc_param mp; ci_t *ci; @@ -634,7 +634,7 @@ do_musycc_rw (struct net_device * ndev, void *data) } 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; int ret; @@ -652,7 +652,7 @@ do_get_chan (struct net_device * ndev, void *data) } 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; int ret; @@ -673,7 +673,7 @@ do_set_chan (struct net_device * ndev, void *data) } STATIC status_t -do_create_chan (struct net_device * ndev, void *data) +do_create_chan (struct net_device *ndev, void *data) { ci_t *ci; struct net_device *dev; @@ -700,7 +700,7 @@ do_create_chan (struct net_device * ndev, void *data) } 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; int ret; @@ -721,7 +721,7 @@ do_get_chan_stats (struct net_device * ndev, void *data) return 0; } 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; @@ -732,7 +732,7 @@ do_set_loglevel (struct net_device * ndev, void *data) } STATIC status_t -do_deluser (struct net_device * ndev, int lockit) +do_deluser (struct net_device *ndev, int lockit) { if (ndev->flags & IFF_UP) return -EBUSY; @@ -763,7 +763,7 @@ do_deluser (struct net_device * ndev, int lockit) } int -do_del_chan (struct net_device * musycc_dev, void *data) +do_del_chan (struct net_device *musycc_dev, void *data) { struct sbecom_chan_param cp; char buf[sizeof (CHANNAME) + 3]; @@ -787,7 +787,7 @@ do_del_chan (struct net_device * musycc_dev, void *data) int c4_reset_board (void *); int -do_reset (struct net_device * musycc_dev, void *data) +do_reset (struct net_device *musycc_dev, void *data) { const struct c4_priv *priv; int i; @@ -816,7 +816,7 @@ do_reset (struct net_device * musycc_dev, void *data) } int -do_reset_chan_stats (struct net_device * musycc_dev, void *data) +do_reset_chan_stats (struct net_device *musycc_dev, void *data) { struct sbecom_chan_param cp; @@ -827,7 +827,7 @@ do_reset_chan_stats (struct net_device * musycc_dev, void *data) } 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; void *data; @@ -954,7 +954,7 @@ static void c4_setup(struct net_device *dev) } struct net_device *__init -c4_add_dev (hdw_info_t * hi, int brdno, unsigned long f0, unsigned long f1, +c4_add_dev (hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1, int irq0, int irq1) { struct net_device *ndev; diff --git a/drivers/staging/cxt1e1/musycc.c b/drivers/staging/cxt1e1/musycc.c index b2cc68a1fe87..1037086d00a7 100644 --- a/drivers/staging/cxt1e1/musycc.c +++ b/drivers/staging/cxt1e1/musycc.c @@ -74,7 +74,7 @@ void musycc_update_timeslots(mpi_t *); #if 1 STATIC int -musycc_dump_rxbuffer_ring(mch_t * ch, int lockit) +musycc_dump_rxbuffer_ring(mch_t *ch, int lockit) { struct mdesc *m; unsigned long flags = 0; @@ -140,7 +140,7 @@ musycc_dump_rxbuffer_ring(mch_t * ch, int lockit) #if 1 STATIC int -musycc_dump_txbuffer_ring(mch_t * ch, int lockit) +musycc_dump_txbuffer_ring(mch_t *ch, int lockit) { struct mdesc *m; unsigned long flags = 0; @@ -205,7 +205,7 @@ musycc_dump_txbuffer_ring(mch_t * ch, int lockit) */ status_t -musycc_dump_ring(ci_t * ci, unsigned int chan) +musycc_dump_ring(ci_t *ci, unsigned int chan) { mch_t *ch; @@ -248,7 +248,7 @@ musycc_dump_ring(ci_t * ci, unsigned int chan) status_t -musycc_dump_rings(ci_t * ci, unsigned int start_chan) +musycc_dump_rings(ci_t *ci, unsigned int start_chan) { unsigned int chan; @@ -264,7 +264,7 @@ musycc_dump_rings(ci_t * ci, unsigned int start_chan) */ void -musycc_init_mdt(mpi_t * pi) +musycc_init_mdt(mpi_t *pi) { u_int32_t *addr, cfg; int i; @@ -288,7 +288,7 @@ musycc_init_mdt(mpi_t * pi) /* Set TX thp to the next unprocessed md */ void -musycc_update_tx_thp(mch_t * ch) +musycc_update_tx_thp(mch_t *ch) { struct mdesc *md; unsigned long flags; @@ -443,7 +443,7 @@ musycc_wq_chan_restart(void *arg) /* channel private structure */ */ void -musycc_chan_restart(mch_t * ch) +musycc_chan_restart(mch_t *ch) { #ifdef RLD_RESTART_DEBUG pr_info("++ musycc_chan_restart[%d]: txd_irq_srv @ %p = sts %x\n", @@ -461,7 +461,7 @@ musycc_chan_restart(mch_t * ch) void -rld_put_led(mpi_t * pi, u_int32_t ledval) +rld_put_led(mpi_t *pi, u_int32_t ledval) { static u_int32_t led = 0; @@ -477,7 +477,7 @@ rld_put_led(mpi_t * pi, u_int32_t ledval) #define MUSYCC_SR_RETRY_CNT 9 void -musycc_serv_req(mpi_t * pi, u_int32_t req) +musycc_serv_req(mpi_t *pi, u_int32_t req) { volatile u_int32_t r; int rcnt; @@ -578,7 +578,7 @@ rewrite: #ifdef SBE_PMCC4_ENABLE void -musycc_update_timeslots(mpi_t * pi) +musycc_update_timeslots(mpi_t *pi) { int i, ch; char e1mode = IS_FRAME_ANY_E1(pi->p.port_mode); @@ -640,7 +640,7 @@ musycc_update_timeslots(mpi_t * pi) #ifdef SBE_WAN256T3_ENABLE void -musycc_update_timeslots(mpi_t * pi) +musycc_update_timeslots(mpi_t *pi) { mch_t *ch; @@ -703,7 +703,7 @@ musycc_chan_proto(int proto) #ifdef SBE_WAN256T3_ENABLE 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)); @@ -737,7 +737,7 @@ musycc_init_port(mpi_t * pi) status_t __init -musycc_init(ci_t * ci) +musycc_init(ci_t *ci) { char *regaddr; /* temp for address boundary calculations */ int i, gchan; @@ -832,7 +832,7 @@ musycc_init(ci_t * ci) void -musycc_bh_tx_eom(mpi_t * pi, int gchan) +musycc_bh_tx_eom(mpi_t *pi, int gchan) { mch_t *ch; struct mdesc *md; @@ -1010,7 +1010,7 @@ musycc_bh_tx_eom(mpi_t * pi, int gchan) STATIC void -musycc_bh_rx_eom(mpi_t * pi, int gchan) +musycc_bh_rx_eom(mpi_t *pi, int gchan) { mch_t *ch; void *m, *m2; @@ -1229,7 +1229,7 @@ unsigned long #else void #endif -musycc_intr_bh_tasklet(ci_t * ci) +musycc_intr_bh_tasklet(ci_t *ci) { mpi_t *pi; mch_t *ch; @@ -1517,7 +1517,7 @@ musycc_intr_bh_tasklet(ci_t * ci) #if 0 int __init -musycc_new_chan(ci_t * ci, int channum, void *user) +musycc_new_chan(ci_t *ci, int channum, void *user) { mch_t *ch; @@ -1546,7 +1546,7 @@ musycc_new_chan(ci_t * ci, int channum, void *user) #ifdef SBE_PMCC4_ENABLE status_t -musycc_chan_down(ci_t * dummy, int channum) +musycc_chan_down(ci_t *dummy, int channum) { mpi_t *pi; mch_t *ch; @@ -1597,7 +1597,7 @@ musycc_chan_down(ci_t * dummy, int channum) int -musycc_del_chan(ci_t * ci, int channum) +musycc_del_chan(ci_t *ci, int channum) { mch_t *ch; @@ -1613,7 +1613,7 @@ musycc_del_chan(ci_t * ci, int channum) int -musycc_del_chan_stats(ci_t * ci, int channum) +musycc_del_chan_stats(ci_t *ci, int channum) { mch_t *ch; @@ -1628,7 +1628,7 @@ musycc_del_chan_stats(ci_t * ci, int channum) int -musycc_start_xmit(ci_t * ci, int channum, void *mem_token) +musycc_start_xmit(ci_t *ci, int channum, void *mem_token) { mch_t *ch; struct mdesc *md; diff --git a/drivers/staging/cxt1e1/pmcc4.h b/drivers/staging/cxt1e1/pmcc4.h index b0ed4ad13011..003eb8690190 100644 --- a/drivers/staging/cxt1e1/pmcc4.h +++ b/drivers/staging/cxt1e1/pmcc4.h @@ -85,15 +85,15 @@ void c4_cleanup (void); status_t c4_chan_up (ci_t *, int channum); status_t c4_del_chan_stats (int channum); status_t c4_del_chan (int channum); -status_t c4_get_iidinfo (ci_t * ci, struct sbe_iid_info * iip); +status_t c4_get_iidinfo (ci_t *ci, struct sbe_iid_info *iip); int c4_is_chan_up (int channum); void *getuserbychan (int channum); -void pci_flush_write (ci_t * ci); +void pci_flush_write (ci_t *ci); void sbecom_set_loglevel (int debuglevel); -char *sbeid_get_bdname (ci_t * ci); -void sbeid_set_bdtype (ci_t * ci); -void sbeid_set_hdwbid (ci_t * ci); +char *sbeid_get_bdname (ci_t *ci); +void sbeid_set_bdtype (ci_t *ci); +void sbeid_set_hdwbid (ci_t *ci); u_int32_t sbeCrc (u_int8_t *, u_int32_t, u_int32_t, u_int32_t *); void VMETRO_TRACE (void *); /* put data into 8 LEDs */ diff --git a/drivers/staging/cxt1e1/pmcc4_drv.c b/drivers/staging/cxt1e1/pmcc4_drv.c index 85b4c84ccd98..772dd211fa6d 100644 --- a/drivers/staging/cxt1e1/pmcc4_drv.c +++ b/drivers/staging/cxt1e1/pmcc4_drv.c @@ -193,7 +193,7 @@ c4_new (void *hi) #define COMET_LBCMD_READ 0x80 /* read only (do not set, return read value) */ void -checkPorts (ci_t * ci) +checkPorts (ci_t *ci) { #ifndef CONFIG_SBE_PMCC4_NCOMM /* @@ -459,7 +459,7 @@ checkPorts (ci_t * ci) STATIC void -c4_watchdog (ci_t * ci) +c4_watchdog (ci_t *ci) { if (drvr_state != SBE_DRVR_AVAILABLE) { @@ -512,7 +512,7 @@ c4_cleanup (void) */ int -c4_get_portcfg (ci_t * ci) +c4_get_portcfg (ci_t *ci) { comet_t *comet; int portnum, mask; @@ -536,7 +536,7 @@ c4_get_portcfg (ci_t * ci) /* nothing herein should generate interrupts */ status_t __init -c4_init (ci_t * ci, u_char *func0, u_char *func1) +c4_init (ci_t *ci, u_char *func0, u_char *func1) { mpi_t *pi; mch_t *ch; @@ -670,7 +670,7 @@ c4_init (ci_t * ci, u_char *func0, u_char *func1) /* better be fully setup to handle interrupts when you call this */ status_t __init -c4_init2 (ci_t * ci) +c4_init2 (ci_t *ci) { status_t ret; @@ -698,7 +698,7 @@ c4_init2 (ci_t * ci) /* This function sets the loopback mode (or clears it, as the case may be). */ int -c4_loop_port (ci_t * ci, int portnum, u_int8_t cmd) +c4_loop_port (ci_t *ci, int portnum, u_int8_t cmd) { comet_t *comet; volatile u_int32_t loopValue; @@ -757,7 +757,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) +c4_frame_rw (ci_t *ci, struct sbecom_port_param *pp) { comet_t *comet; volatile u_int32_t data; @@ -796,7 +796,7 @@ c4_frame_rw (ci_t * ci, struct sbecom_port_param * pp) */ status_t -c4_pld_rw (ci_t * ci, struct sbecom_port_param * pp) +c4_pld_rw (ci_t *ci, struct sbecom_port_param *pp) { volatile u_int32_t *regaddr; volatile u_int32_t data; @@ -834,7 +834,7 @@ c4_pld_rw (ci_t * ci, struct sbecom_port_param * pp) */ status_t -c4_musycc_rw (ci_t * ci, struct c4_musycc_param * mcp) +c4_musycc_rw (ci_t *ci, struct c4_musycc_param *mcp) { mpi_t *pi; volatile u_int32_t *dph; /* hardware implemented register */ @@ -898,7 +898,7 @@ c4_musycc_rw (ci_t * ci, struct c4_musycc_param * mcp) } status_t -c4_get_port (ci_t * ci, int portnum) +c4_get_port (ci_t *ci, int portnum) { if (portnum >= ci->max_port) /* sanity check */ return ENXIO; @@ -913,7 +913,7 @@ c4_get_port (ci_t * ci, int portnum) } status_t -c4_set_port (ci_t * ci, int portnum) +c4_set_port (ci_t *ci, int portnum) { mpi_t *pi; struct sbecom_port_param *pp; @@ -1018,7 +1018,7 @@ c4_set_port (ci_t * ci, int portnum) unsigned int max_int = 0; status_t -c4_new_chan (ci_t * ci, int portnum, int channum, void *user) +c4_new_chan (ci_t *ci, int portnum, int channum, void *user) { mpi_t *pi; mch_t *ch; @@ -1111,7 +1111,7 @@ c4_del_chan_stats (int channum) status_t -c4_set_chan (int channum, struct sbecom_chan_param * p) +c4_set_chan (int channum, struct sbecom_chan_param *p) { mch_t *ch; int i, x = 0; @@ -1162,7 +1162,7 @@ c4_set_chan (int channum, struct sbecom_chan_param * p) status_t -c4_get_chan (int channum, struct sbecom_chan_param * p) +c4_get_chan (int channum, struct sbecom_chan_param *p) { mch_t *ch; @@ -1173,7 +1173,7 @@ c4_get_chan (int channum, struct sbecom_chan_param * p) } status_t -c4_get_chan_stats (int channum, struct sbecom_chan_stats * p) +c4_get_chan_stats (int channum, struct sbecom_chan_stats *p) { mch_t *ch; @@ -1185,7 +1185,7 @@ c4_get_chan_stats (int channum, struct sbecom_chan_stats * p) } 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; @@ -1222,7 +1222,7 @@ c4_fifo_alloc (mpi_t * pi, int chan, int *len) } void -c4_fifo_free (mpi_t * pi, int chan) +c4_fifo_free (mpi_t *pi, int chan) { int i; @@ -1236,7 +1236,7 @@ c4_fifo_free (mpi_t * pi, int chan) status_t -c4_chan_up (ci_t * ci, int channum) +c4_chan_up (ci_t *ci, int channum) { mpi_t *pi; mch_t *ch; @@ -1467,7 +1467,7 @@ errfree: /* stop the hardware from servicing & interrupting */ void -c4_stopwd (ci_t * ci) +c4_stopwd (ci_t *ci) { OS_stop_watchdog (&ci->wd); SD_SEM_TAKE (&ci->sem_wdbusy, "_stop_"); /* ensure WD not running */ @@ -1476,7 +1476,7 @@ c4_stopwd (ci_t * ci) void -sbecom_get_brdinfo (ci_t * ci, struct sbe_brd_info * bip, u_int8_t *bsn) +sbecom_get_brdinfo (ci_t *ci, struct sbe_brd_info *bip, u_int8_t *bsn) { char *np; u_int32_t sn = 0; @@ -1485,7 +1485,7 @@ sbecom_get_brdinfo (ci_t * ci, struct sbe_brd_info * bip, u_int8_t *bsn) bip->brdno = ci->brdno; /* our board number */ bip->brd_id = ci->brd_id; bip->brd_hdw_id = ci->hdw_bid; - bip->brd_chan_cnt = MUSYCC_NCHANS * ci->max_port; /* number of channels + bip->brd_chan_cnt = MUSYCC_NCHANS *ci->max_port; /* number of channels * being used */ bip->brd_port_cnt = ci->max_port; /* number of ports being used */ bip->brd_pci_speed = BINFO_PCI_SPEED_unk; /* PCI speed not yet @@ -1535,7 +1535,7 @@ sbecom_get_brdinfo (ci_t * ci, struct sbe_brd_info * bip, u_int8_t *bsn) status_t -c4_get_iidinfo (ci_t * ci, struct sbe_iid_info * iip) +c4_get_iidinfo (ci_t *ci, struct sbe_iid_info *iip) { struct net_device *dev; char *np; diff --git a/drivers/staging/cxt1e1/sbecom_inline_linux.h b/drivers/staging/cxt1e1/sbecom_inline_linux.h index 68ed445ab0cb..3c6d1c0fc6d6 100644 --- a/drivers/staging/cxt1e1/sbecom_inline_linux.h +++ b/drivers/staging/cxt1e1/sbecom_inline_linux.h @@ -177,7 +177,7 @@ struct watchdog static inline int -OS_start_watchdog (struct watchdog * wd) +OS_start_watchdog (struct watchdog *wd) { wd->h.expires = jiffies + wd->ticks; add_timer (&wd->h); @@ -186,7 +186,7 @@ OS_start_watchdog (struct watchdog * wd) static inline int -OS_stop_watchdog (struct watchdog * wd) +OS_stop_watchdog (struct watchdog *wd) { del_timer_sync (&wd->h); return 0; @@ -194,7 +194,7 @@ OS_stop_watchdog (struct watchdog * wd) static inline int -OS_free_watchdog (struct watchdog * wd) +OS_free_watchdog (struct watchdog *wd) { OS_stop_watchdog (wd); OS_kfree (wd); diff --git a/drivers/staging/cxt1e1/sbeid.c b/drivers/staging/cxt1e1/sbeid.c index a2243b10ef05..0f9bd5f8136c 100644 --- a/drivers/staging/cxt1e1/sbeid.c +++ b/drivers/staging/cxt1e1/sbeid.c @@ -27,7 +27,7 @@ char * -sbeid_get_bdname (ci_t * ci) +sbeid_get_bdname (ci_t *ci) { char *np = 0; @@ -73,7 +73,7 @@ sbeid_get_bdname (ci_t * ci) /* given the presetting of brd_id, set the corresponding hdw_id */ void -sbeid_set_hdwbid (ci_t * ci) +sbeid_set_hdwbid (ci_t *ci) { /* * set SBE's unique hardware identification (for legacy boards might not @@ -170,7 +170,7 @@ sbeid_set_hdwbid (ci_t * ci) /* given the presetting of hdw_bid, set the corresponding brd_id */ void -sbeid_set_bdtype (ci_t * ci) +sbeid_set_bdtype (ci_t *ci) { /* set SBE's unique PCI VENDOR/DEVID */ switch (ci->hdw_bid) diff --git a/drivers/staging/cxt1e1/sbeproc.h b/drivers/staging/cxt1e1/sbeproc.h index e5c072cf1952..37285df359c1 100644 --- a/drivers/staging/cxt1e1/sbeproc.h +++ b/drivers/staging/cxt1e1/sbeproc.h @@ -28,11 +28,11 @@ int __init sbecom_proc_brd_init (ci_t *); #else -static inline void sbecom_proc_brd_cleanup(ci_t * ci) +static inline void sbecom_proc_brd_cleanup(ci_t *ci) { } -static inline int __init sbecom_proc_brd_init(ci_t * ci) +static inline int __init sbecom_proc_brd_init(ci_t *ci) { return 0; } -- 2.30.2