Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <dulshani.gunawardhana89@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Dulshani Gunawardhana and committed by
Greg Kroah-Hartman
ee1803cf cd1ccce1

+104 -104
+11 -11
drivers/staging/cxt1e1/comet.c
··· 35 35 #define COMET_NUM_UNITS 5 /* Number of points per entry in table */ 36 36 37 37 /* forward references */ 38 - STATIC void SetPwrLevel(comet_t * comet); 39 - STATIC void WrtRcvEqualizerTbl(ci_t * ci, comet_t * comet, u_int32_t *table); 40 - STATIC void WrtXmtWaveformTbl(ci_t * ci, comet_t * comet, u_int8_t table[COMET_NUM_SAMPLES][COMET_NUM_UNITS]); 38 + STATIC void SetPwrLevel(comet_t *comet); 39 + STATIC void WrtRcvEqualizerTbl(ci_t *ci, comet_t *comet, u_int32_t *table); 40 + STATIC void WrtXmtWaveformTbl(ci_t *ci, comet_t *comet, u_int8_t table[COMET_NUM_SAMPLES][COMET_NUM_UNITS]); 41 41 42 42 43 43 void *TWV_table[12] = { ··· 65 65 return (lbo - 1); 66 66 } 67 67 68 - void init_comet(void *ci, comet_t * comet, u_int32_t port_mode, int clockmaster, 68 + void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster, 69 69 u_int8_t moreParams) 70 70 { 71 71 u_int8_t isT1mode; ··· 408 408 ** Returns: Nothing 409 409 */ 410 410 STATIC void 411 - WrtXmtWaveform(ci_t * ci, comet_t * comet, u_int32_t sample, u_int32_t unit, u_int8_t data) 411 + WrtXmtWaveform(ci_t *ci, comet_t *comet, u_int32_t sample, u_int32_t unit, u_int8_t data) 412 412 { 413 - WaveformAddr; 413 + u_int8_t WaveformAddr; 414 414 415 415 WaveformAddr = (sample << 3) + (unit & 7); 416 416 pci_write_32((u_int32_t *) &comet->xlpg_pwave_addr, WaveformAddr); ··· 426 426 ** Returns: Nothing 427 427 */ 428 428 STATIC void 429 - WrtXmtWaveformTbl(ci_t * ci, comet_t * comet, 429 + WrtXmtWaveformTbl(ci_t *ci, comet_t *comet, 430 430 u_int8_t table[COMET_NUM_SAMPLES][COMET_NUM_UNITS]) 431 431 { 432 432 u_int32_t sample, unit; ··· 453 453 */ 454 454 455 455 STATIC void 456 - WrtRcvEqualizerTbl(ci_t * ci, comet_t * comet, u_int32_t *table) 456 + WrtRcvEqualizerTbl(ci_t *ci, comet_t *comet, u_int32_t *table) 457 457 { 458 458 u_int32_t ramaddr; 459 459 volatile u_int32_t value; ··· 502 502 * by T1/E1 clock 503 503 */ 504 504 /* 683ns * 3 = 1366 ns, approx 2us (but use 4us) */ 505 - OS_uwait(4, "wret") 505 + OS_uwait(4, "wret"); 506 506 } 507 507 508 508 /* Enable Equalizer & set it to use 256 periods */ ··· 517 517 */ 518 518 519 519 STATIC void 520 - SetPwrLevel(comet_t * comet) 520 + SetPwrLevel(comet_t *comet) 521 521 { 522 522 volatile u_int32_t temp; 523 523 ··· 559 559 */ 560 560 #if 0 561 561 STATIC void 562 - SetCometOps(comet_t * comet) 562 + SetCometOps(comet_t *comet) 563 563 { 564 564 volatile u_int8_t rd_value; 565 565
+2 -2
drivers/staging/cxt1e1/functions.c
··· 97 97 98 98 99 99 void 100 - pci_flush_write (ci_t * ci) 100 + pci_flush_write (ci_t *ci) 101 101 { 102 102 volatile u_int32_t v; 103 103 ··· 279 279 280 280 281 281 void 282 - VMETRO_TRIGGER (ci_t * ci, int x) 282 + VMETRO_TRIGGER (ci_t *ci, int x) 283 283 { 284 284 comet_t *comet; 285 285 volatile u_int32_t data;
+3 -3
drivers/staging/cxt1e1/hwprobe.c
··· 50 50 51 51 52 52 void __init 53 - show_two (hdw_info_t * hi, int brdno) 53 + show_two (hdw_info_t *hi, int brdno) 54 54 { 55 55 ci_t *ci; 56 56 struct pci_dev *pdev; ··· 102 102 103 103 104 104 void __init 105 - hdw_sn_get (hdw_info_t * hi, int brdno) 105 + hdw_sn_get (hdw_info_t *hi, int brdno) 106 106 { 107 107 /* obtain hardware EEPROM information */ 108 108 long addr; ··· 222 222 223 223 224 224 STATIC int __init 225 - c4_hdw_init (struct pci_dev * pdev, int found) 225 + c4_hdw_init (struct pci_dev *pdev, int found) 226 226 { 227 227 hdw_info_t *hi; 228 228 int i;
+32 -32
drivers/staging/cxt1e1/linux.c
··· 144 144 145 145 146 146 char * 147 - get_hdlc_name (hdlc_device * hdlc) 147 + get_hdlc_name (hdlc_device *hdlc) 148 148 { 149 149 struct c4_priv *priv = hdlc->priv; 150 150 struct net_device *dev = getuserbychan (priv->channum); ··· 185 185 * within a port's group. 186 186 */ 187 187 void 188 - c4_wk_chan_restart (mch_t * ch) 188 + c4_wk_chan_restart (mch_t *ch) 189 189 { 190 190 mpi_t *pi = ch->up; 191 191 ··· 203 203 } 204 204 205 205 status_t 206 - c4_wk_chan_init (mpi_t * pi, mch_t * ch) 206 + c4_wk_chan_init (mpi_t *pi, mch_t *ch) 207 207 { 208 208 /* 209 209 * this will be used to restart a stopped channel ··· 218 218 } 219 219 220 220 status_t 221 - c4_wq_port_init (mpi_t * pi) 221 + c4_wq_port_init (mpi_t *pi) 222 222 { 223 223 224 224 char name[16], *np; /* NOTE: name of the queue limited by system ··· 241 241 } 242 242 243 243 void 244 - c4_wq_port_cleanup (mpi_t * pi) 244 + c4_wq_port_cleanup (mpi_t *pi) 245 245 { 246 246 /* 247 247 * PORT POINT: cannot call this if WQ is statically allocated w/in ··· 278 278 279 279 280 280 static int 281 - void_open (struct net_device * ndev) 281 + void_open (struct net_device *ndev) 282 282 { 283 283 pr_info("%s: trying to open master device !\n", ndev->name); 284 284 return -1; ··· 286 286 287 287 288 288 STATIC int 289 - chan_open (struct net_device * ndev) 289 + chan_open (struct net_device *ndev) 290 290 { 291 291 hdlc_device *hdlc = dev_to_hdlc (ndev); 292 292 const struct c4_priv *priv = hdlc->priv; ··· 306 306 307 307 308 308 STATIC int 309 - chan_close (struct net_device * ndev) 309 + chan_close (struct net_device *ndev) 310 310 { 311 311 hdlc_device *hdlc = dev_to_hdlc (ndev); 312 312 const struct c4_priv *priv = hdlc->priv; ··· 320 320 321 321 322 322 STATIC int 323 - chan_dev_ioctl (struct net_device * dev, struct ifreq * ifr, int cmd) 323 + chan_dev_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) 324 324 { 325 325 return hdlc_ioctl (dev, ifr, cmd); 326 326 } 327 327 328 328 329 329 STATIC int 330 - chan_attach_noop (struct net_device * ndev, unsigned short foo_1, unsigned short foo_2) 330 + chan_attach_noop (struct net_device *ndev, unsigned short foo_1, unsigned short foo_2) 331 331 { 332 332 return 0; /* our driver has nothing to do here, show's 333 333 * over, go home */ ··· 335 335 336 336 337 337 STATIC struct net_device_stats * 338 - chan_get_stats (struct net_device * ndev) 338 + chan_get_stats (struct net_device *ndev) 339 339 { 340 340 mch_t *ch; 341 341 struct net_device_stats *nstats; ··· 388 388 389 389 390 390 static ci_t * 391 - get_ci_by_dev (struct net_device * ndev) 391 + get_ci_by_dev (struct net_device *ndev) 392 392 { 393 393 return (ci_t *)(netdev_priv(ndev)); 394 394 } 395 395 396 396 397 397 STATIC int 398 - c4_linux_xmit (struct sk_buff * skb, struct net_device * ndev) 398 + c4_linux_xmit (struct sk_buff *skb, struct net_device *ndev) 399 399 { 400 400 const struct c4_priv *priv; 401 401 int rval; ··· 417 417 }; 418 418 419 419 STATIC struct net_device * 420 - create_chan (struct net_device * ndev, ci_t * ci, 421 - struct sbecom_chan_param * cp) 420 + create_chan (struct net_device *ndev, ci_t *ci, 421 + struct sbecom_chan_param *cp) 422 422 { 423 423 hdlc_device *hdlc; 424 424 struct net_device *dev; ··· 510 510 511 511 /* the idea here is to get port information and pass it back (using pointer) */ 512 512 STATIC status_t 513 - do_get_port (struct net_device * ndev, void *data) 513 + do_get_port (struct net_device *ndev, void *data) 514 514 { 515 515 int ret; 516 516 ci_t *ci; /* ci stands for card information */ ··· 535 535 536 536 /* this function copys the user data and then calls the real action function */ 537 537 STATIC status_t 538 - do_set_port (struct net_device * ndev, void *data) 538 + do_set_port (struct net_device *ndev, void *data) 539 539 { 540 540 ci_t *ci; /* ci stands for card information */ 541 541 struct sbecom_port_param pp;/* copy data to kernel land */ ··· 557 557 558 558 /* work the port loopback mode as per directed */ 559 559 STATIC status_t 560 - do_port_loop (struct net_device * ndev, void *data) 560 + do_port_loop (struct net_device *ndev, void *data) 561 561 { 562 562 struct sbecom_port_param pp; 563 563 ci_t *ci; ··· 572 572 573 573 /* set the specified register with the given value / or just read it */ 574 574 STATIC status_t 575 - do_framer_rw (struct net_device * ndev, void *data) 575 + do_framer_rw (struct net_device *ndev, void *data) 576 576 { 577 577 struct sbecom_port_param pp; 578 578 ci_t *ci; ··· 593 593 594 594 /* set the specified register with the given value / or just read it */ 595 595 STATIC status_t 596 - do_pld_rw (struct net_device * ndev, void *data) 596 + do_pld_rw (struct net_device *ndev, void *data) 597 597 { 598 598 struct sbecom_port_param pp; 599 599 ci_t *ci; ··· 614 614 615 615 /* set the specified register with the given value / or just read it */ 616 616 STATIC status_t 617 - do_musycc_rw (struct net_device * ndev, void *data) 617 + do_musycc_rw (struct net_device *ndev, void *data) 618 618 { 619 619 struct c4_musycc_param mp; 620 620 ci_t *ci; ··· 634 634 } 635 635 636 636 STATIC status_t 637 - do_get_chan (struct net_device * ndev, void *data) 637 + do_get_chan (struct net_device *ndev, void *data) 638 638 { 639 639 struct sbecom_chan_param cp; 640 640 int ret; ··· 652 652 } 653 653 654 654 STATIC status_t 655 - do_set_chan (struct net_device * ndev, void *data) 655 + do_set_chan (struct net_device *ndev, void *data) 656 656 { 657 657 struct sbecom_chan_param cp; 658 658 int ret; ··· 673 673 } 674 674 675 675 STATIC status_t 676 - do_create_chan (struct net_device * ndev, void *data) 676 + do_create_chan (struct net_device *ndev, void *data) 677 677 { 678 678 ci_t *ci; 679 679 struct net_device *dev; ··· 700 700 } 701 701 702 702 STATIC status_t 703 - do_get_chan_stats (struct net_device * ndev, void *data) 703 + do_get_chan_stats (struct net_device *ndev, void *data) 704 704 { 705 705 struct c4_chan_stats_wrap ccs; 706 706 int ret; ··· 721 721 return 0; 722 722 } 723 723 STATIC status_t 724 - do_set_loglevel (struct net_device * ndev, void *data) 724 + do_set_loglevel (struct net_device *ndev, void *data) 725 725 { 726 726 unsigned int cxt1e1_log_level; 727 727 ··· 732 732 } 733 733 734 734 STATIC status_t 735 - do_deluser (struct net_device * ndev, int lockit) 735 + do_deluser (struct net_device *ndev, int lockit) 736 736 { 737 737 if (ndev->flags & IFF_UP) 738 738 return -EBUSY; ··· 763 763 } 764 764 765 765 int 766 - do_del_chan (struct net_device * musycc_dev, void *data) 766 + do_del_chan (struct net_device *musycc_dev, void *data) 767 767 { 768 768 struct sbecom_chan_param cp; 769 769 char buf[sizeof (CHANNAME) + 3]; ··· 787 787 int c4_reset_board (void *); 788 788 789 789 int 790 - do_reset (struct net_device * musycc_dev, void *data) 790 + do_reset (struct net_device *musycc_dev, void *data) 791 791 { 792 792 const struct c4_priv *priv; 793 793 int i; ··· 816 816 } 817 817 818 818 int 819 - do_reset_chan_stats (struct net_device * musycc_dev, void *data) 819 + do_reset_chan_stats (struct net_device *musycc_dev, void *data) 820 820 { 821 821 struct sbecom_chan_param cp; 822 822 ··· 827 827 } 828 828 829 829 STATIC status_t 830 - c4_ioctl (struct net_device * ndev, struct ifreq * ifr, int cmd) 830 + c4_ioctl (struct net_device *ndev, struct ifreq *ifr, int cmd) 831 831 { 832 832 ci_t *ci; 833 833 void *data; ··· 954 954 } 955 955 956 956 struct net_device *__init 957 - c4_add_dev (hdw_info_t * hi, int brdno, unsigned long f0, unsigned long f1, 957 + c4_add_dev (hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1, 958 958 int irq0, int irq1) 959 959 { 960 960 struct net_device *ndev;
+21 -21
drivers/staging/cxt1e1/musycc.c
··· 74 74 75 75 #if 1 76 76 STATIC int 77 - musycc_dump_rxbuffer_ring(mch_t * ch, int lockit) 77 + musycc_dump_rxbuffer_ring(mch_t *ch, int lockit) 78 78 { 79 79 struct mdesc *m; 80 80 unsigned long flags = 0; ··· 140 140 141 141 #if 1 142 142 STATIC int 143 - musycc_dump_txbuffer_ring(mch_t * ch, int lockit) 143 + musycc_dump_txbuffer_ring(mch_t *ch, int lockit) 144 144 { 145 145 struct mdesc *m; 146 146 unsigned long flags = 0; ··· 205 205 */ 206 206 207 207 status_t 208 - musycc_dump_ring(ci_t * ci, unsigned int chan) 208 + musycc_dump_ring(ci_t *ci, unsigned int chan) 209 209 { 210 210 mch_t *ch; 211 211 ··· 248 248 249 249 250 250 status_t 251 - musycc_dump_rings(ci_t * ci, unsigned int start_chan) 251 + musycc_dump_rings(ci_t *ci, unsigned int start_chan) 252 252 { 253 253 unsigned int chan; 254 254 ··· 264 264 */ 265 265 266 266 void 267 - musycc_init_mdt(mpi_t * pi) 267 + musycc_init_mdt(mpi_t *pi) 268 268 { 269 269 u_int32_t *addr, cfg; 270 270 int i; ··· 288 288 /* Set TX thp to the next unprocessed md */ 289 289 290 290 void 291 - musycc_update_tx_thp(mch_t * ch) 291 + musycc_update_tx_thp(mch_t *ch) 292 292 { 293 293 struct mdesc *md; 294 294 unsigned long flags; ··· 443 443 */ 444 444 445 445 void 446 - musycc_chan_restart(mch_t * ch) 446 + musycc_chan_restart(mch_t *ch) 447 447 { 448 448 #ifdef RLD_RESTART_DEBUG 449 449 pr_info("++ musycc_chan_restart[%d]: txd_irq_srv @ %p = sts %x\n", ··· 461 461 462 462 463 463 void 464 - rld_put_led(mpi_t * pi, u_int32_t ledval) 464 + rld_put_led(mpi_t *pi, u_int32_t ledval) 465 465 { 466 466 static u_int32_t led = 0; 467 467 ··· 477 477 #define MUSYCC_SR_RETRY_CNT 9 478 478 479 479 void 480 - musycc_serv_req(mpi_t * pi, u_int32_t req) 480 + musycc_serv_req(mpi_t *pi, u_int32_t req) 481 481 { 482 482 volatile u_int32_t r; 483 483 int rcnt; ··· 578 578 579 579 #ifdef SBE_PMCC4_ENABLE 580 580 void 581 - musycc_update_timeslots(mpi_t * pi) 581 + musycc_update_timeslots(mpi_t *pi) 582 582 { 583 583 int i, ch; 584 584 char e1mode = IS_FRAME_ANY_E1(pi->p.port_mode); ··· 640 640 641 641 #ifdef SBE_WAN256T3_ENABLE 642 642 void 643 - musycc_update_timeslots(mpi_t * pi) 643 + musycc_update_timeslots(mpi_t *pi) 644 644 { 645 645 mch_t *ch; 646 646 ··· 703 703 704 704 #ifdef SBE_WAN256T3_ENABLE 705 705 STATIC void __init 706 - musycc_init_port(mpi_t * pi) 706 + musycc_init_port(mpi_t *pi) 707 707 { 708 708 pci_write_32((u_int32_t *) &pi->reg->gbp, OS_vtophys(pi->regram)); 709 709 ··· 737 737 738 738 739 739 status_t __init 740 - musycc_init(ci_t * ci) 740 + musycc_init(ci_t *ci) 741 741 { 742 742 char *regaddr; /* temp for address boundary calculations */ 743 743 int i, gchan; ··· 832 832 833 833 834 834 void 835 - musycc_bh_tx_eom(mpi_t * pi, int gchan) 835 + musycc_bh_tx_eom(mpi_t *pi, int gchan) 836 836 { 837 837 mch_t *ch; 838 838 struct mdesc *md; ··· 1010 1010 1011 1011 1012 1012 STATIC void 1013 - musycc_bh_rx_eom(mpi_t * pi, int gchan) 1013 + musycc_bh_rx_eom(mpi_t *pi, int gchan) 1014 1014 { 1015 1015 mch_t *ch; 1016 1016 void *m, *m2; ··· 1229 1229 #else 1230 1230 void 1231 1231 #endif 1232 - musycc_intr_bh_tasklet(ci_t * ci) 1232 + musycc_intr_bh_tasklet(ci_t *ci) 1233 1233 { 1234 1234 mpi_t *pi; 1235 1235 mch_t *ch; ··· 1517 1517 1518 1518 #if 0 1519 1519 int __init 1520 - musycc_new_chan(ci_t * ci, int channum, void *user) 1520 + musycc_new_chan(ci_t *ci, int channum, void *user) 1521 1521 { 1522 1522 mch_t *ch; 1523 1523 ··· 1546 1546 1547 1547 #ifdef SBE_PMCC4_ENABLE 1548 1548 status_t 1549 - musycc_chan_down(ci_t * dummy, int channum) 1549 + musycc_chan_down(ci_t *dummy, int channum) 1550 1550 { 1551 1551 mpi_t *pi; 1552 1552 mch_t *ch; ··· 1597 1597 1598 1598 1599 1599 int 1600 - musycc_del_chan(ci_t * ci, int channum) 1600 + musycc_del_chan(ci_t *ci, int channum) 1601 1601 { 1602 1602 mch_t *ch; 1603 1603 ··· 1613 1613 1614 1614 1615 1615 int 1616 - musycc_del_chan_stats(ci_t * ci, int channum) 1616 + musycc_del_chan_stats(ci_t *ci, int channum) 1617 1617 { 1618 1618 mch_t *ch; 1619 1619 ··· 1628 1628 1629 1629 1630 1630 int 1631 - musycc_start_xmit(ci_t * ci, int channum, void *mem_token) 1631 + musycc_start_xmit(ci_t *ci, int channum, void *mem_token) 1632 1632 { 1633 1633 mch_t *ch; 1634 1634 struct mdesc *md;
+5 -5
drivers/staging/cxt1e1/pmcc4.h
··· 85 85 status_t c4_chan_up (ci_t *, int channum); 86 86 status_t c4_del_chan_stats (int channum); 87 87 status_t c4_del_chan (int channum); 88 - status_t c4_get_iidinfo (ci_t * ci, struct sbe_iid_info * iip); 88 + status_t c4_get_iidinfo (ci_t *ci, struct sbe_iid_info *iip); 89 89 int c4_is_chan_up (int channum); 90 90 91 91 void *getuserbychan (int channum); 92 - void pci_flush_write (ci_t * ci); 92 + void pci_flush_write (ci_t *ci); 93 93 void sbecom_set_loglevel (int debuglevel); 94 - char *sbeid_get_bdname (ci_t * ci); 95 - void sbeid_set_bdtype (ci_t * ci); 96 - void sbeid_set_hdwbid (ci_t * ci); 94 + char *sbeid_get_bdname (ci_t *ci); 95 + void sbeid_set_bdtype (ci_t *ci); 96 + void sbeid_set_hdwbid (ci_t *ci); 97 97 u_int32_t sbeCrc (u_int8_t *, u_int32_t, u_int32_t, u_int32_t *); 98 98 99 99 void VMETRO_TRACE (void *); /* put data into 8 LEDs */
+22 -22
drivers/staging/cxt1e1/pmcc4_drv.c
··· 193 193 #define COMET_LBCMD_READ 0x80 /* read only (do not set, return read value) */ 194 194 195 195 void 196 - checkPorts (ci_t * ci) 196 + checkPorts (ci_t *ci) 197 197 { 198 198 #ifndef CONFIG_SBE_PMCC4_NCOMM 199 199 /* ··· 459 459 460 460 461 461 STATIC void 462 - c4_watchdog (ci_t * ci) 462 + c4_watchdog (ci_t *ci) 463 463 { 464 464 if (drvr_state != SBE_DRVR_AVAILABLE) 465 465 { ··· 512 512 */ 513 513 514 514 int 515 - c4_get_portcfg (ci_t * ci) 515 + c4_get_portcfg (ci_t *ci) 516 516 { 517 517 comet_t *comet; 518 518 int portnum, mask; ··· 536 536 /* nothing herein should generate interrupts */ 537 537 538 538 status_t __init 539 - c4_init (ci_t * ci, u_char *func0, u_char *func1) 539 + c4_init (ci_t *ci, u_char *func0, u_char *func1) 540 540 { 541 541 mpi_t *pi; 542 542 mch_t *ch; ··· 670 670 /* better be fully setup to handle interrupts when you call this */ 671 671 672 672 status_t __init 673 - c4_init2 (ci_t * ci) 673 + c4_init2 (ci_t *ci) 674 674 { 675 675 status_t ret; 676 676 ··· 698 698 /* This function sets the loopback mode (or clears it, as the case may be). */ 699 699 700 700 int 701 - c4_loop_port (ci_t * ci, int portnum, u_int8_t cmd) 701 + c4_loop_port (ci_t *ci, int portnum, u_int8_t cmd) 702 702 { 703 703 comet_t *comet; 704 704 volatile u_int32_t loopValue; ··· 757 757 */ 758 758 759 759 status_t 760 - c4_frame_rw (ci_t * ci, struct sbecom_port_param * pp) 760 + c4_frame_rw (ci_t *ci, struct sbecom_port_param *pp) 761 761 { 762 762 comet_t *comet; 763 763 volatile u_int32_t data; ··· 796 796 */ 797 797 798 798 status_t 799 - c4_pld_rw (ci_t * ci, struct sbecom_port_param * pp) 799 + c4_pld_rw (ci_t *ci, struct sbecom_port_param *pp) 800 800 { 801 801 volatile u_int32_t *regaddr; 802 802 volatile u_int32_t data; ··· 834 834 */ 835 835 836 836 status_t 837 - c4_musycc_rw (ci_t * ci, struct c4_musycc_param * mcp) 837 + c4_musycc_rw (ci_t *ci, struct c4_musycc_param *mcp) 838 838 { 839 839 mpi_t *pi; 840 840 volatile u_int32_t *dph; /* hardware implemented register */ ··· 898 898 } 899 899 900 900 status_t 901 - c4_get_port (ci_t * ci, int portnum) 901 + c4_get_port (ci_t *ci, int portnum) 902 902 { 903 903 if (portnum >= ci->max_port) /* sanity check */ 904 904 return ENXIO; ··· 913 913 } 914 914 915 915 status_t 916 - c4_set_port (ci_t * ci, int portnum) 916 + c4_set_port (ci_t *ci, int portnum) 917 917 { 918 918 mpi_t *pi; 919 919 struct sbecom_port_param *pp; ··· 1018 1018 unsigned int max_int = 0; 1019 1019 1020 1020 status_t 1021 - c4_new_chan (ci_t * ci, int portnum, int channum, void *user) 1021 + c4_new_chan (ci_t *ci, int portnum, int channum, void *user) 1022 1022 { 1023 1023 mpi_t *pi; 1024 1024 mch_t *ch; ··· 1111 1111 1112 1112 1113 1113 status_t 1114 - c4_set_chan (int channum, struct sbecom_chan_param * p) 1114 + c4_set_chan (int channum, struct sbecom_chan_param *p) 1115 1115 { 1116 1116 mch_t *ch; 1117 1117 int i, x = 0; ··· 1162 1162 1163 1163 1164 1164 status_t 1165 - c4_get_chan (int channum, struct sbecom_chan_param * p) 1165 + c4_get_chan (int channum, struct sbecom_chan_param *p) 1166 1166 { 1167 1167 mch_t *ch; 1168 1168 ··· 1173 1173 } 1174 1174 1175 1175 status_t 1176 - c4_get_chan_stats (int channum, struct sbecom_chan_stats * p) 1176 + c4_get_chan_stats (int channum, struct sbecom_chan_stats *p) 1177 1177 { 1178 1178 mch_t *ch; 1179 1179 ··· 1185 1185 } 1186 1186 1187 1187 STATIC int 1188 - c4_fifo_alloc (mpi_t * pi, int chan, int *len) 1188 + c4_fifo_alloc (mpi_t *pi, int chan, int *len) 1189 1189 { 1190 1190 int i, l = 0, start = 0, max = 0, maxstart = 0; 1191 1191 ··· 1222 1222 } 1223 1223 1224 1224 void 1225 - c4_fifo_free (mpi_t * pi, int chan) 1225 + c4_fifo_free (mpi_t *pi, int chan) 1226 1226 { 1227 1227 int i; 1228 1228 ··· 1236 1236 1237 1237 1238 1238 status_t 1239 - c4_chan_up (ci_t * ci, int channum) 1239 + c4_chan_up (ci_t *ci, int channum) 1240 1240 { 1241 1241 mpi_t *pi; 1242 1242 mch_t *ch; ··· 1467 1467 /* stop the hardware from servicing & interrupting */ 1468 1468 1469 1469 void 1470 - c4_stopwd (ci_t * ci) 1470 + c4_stopwd (ci_t *ci) 1471 1471 { 1472 1472 OS_stop_watchdog (&ci->wd); 1473 1473 SD_SEM_TAKE (&ci->sem_wdbusy, "_stop_"); /* ensure WD not running */ ··· 1476 1476 1477 1477 1478 1478 void 1479 - sbecom_get_brdinfo (ci_t * ci, struct sbe_brd_info * bip, u_int8_t *bsn) 1479 + sbecom_get_brdinfo (ci_t *ci, struct sbe_brd_info *bip, u_int8_t *bsn) 1480 1480 { 1481 1481 char *np; 1482 1482 u_int32_t sn = 0; ··· 1485 1485 bip->brdno = ci->brdno; /* our board number */ 1486 1486 bip->brd_id = ci->brd_id; 1487 1487 bip->brd_hdw_id = ci->hdw_bid; 1488 - bip->brd_chan_cnt = MUSYCC_NCHANS * ci->max_port; /* number of channels 1488 + bip->brd_chan_cnt = MUSYCC_NCHANS *ci->max_port; /* number of channels 1489 1489 * being used */ 1490 1490 bip->brd_port_cnt = ci->max_port; /* number of ports being used */ 1491 1491 bip->brd_pci_speed = BINFO_PCI_SPEED_unk; /* PCI speed not yet ··· 1535 1535 1536 1536 1537 1537 status_t 1538 - c4_get_iidinfo (ci_t * ci, struct sbe_iid_info * iip) 1538 + c4_get_iidinfo (ci_t *ci, struct sbe_iid_info *iip) 1539 1539 { 1540 1540 struct net_device *dev; 1541 1541 char *np;
+3 -3
drivers/staging/cxt1e1/sbecom_inline_linux.h
··· 177 177 178 178 179 179 static inline int 180 - OS_start_watchdog (struct watchdog * wd) 180 + OS_start_watchdog (struct watchdog *wd) 181 181 { 182 182 wd->h.expires = jiffies + wd->ticks; 183 183 add_timer (&wd->h); ··· 186 186 187 187 188 188 static inline int 189 - OS_stop_watchdog (struct watchdog * wd) 189 + OS_stop_watchdog (struct watchdog *wd) 190 190 { 191 191 del_timer_sync (&wd->h); 192 192 return 0; ··· 194 194 195 195 196 196 static inline int 197 - OS_free_watchdog (struct watchdog * wd) 197 + OS_free_watchdog (struct watchdog *wd) 198 198 { 199 199 OS_stop_watchdog (wd); 200 200 OS_kfree (wd);
+3 -3
drivers/staging/cxt1e1/sbeid.c
··· 27 27 28 28 29 29 char * 30 - sbeid_get_bdname (ci_t * ci) 30 + sbeid_get_bdname (ci_t *ci) 31 31 { 32 32 char *np = 0; 33 33 ··· 73 73 /* given the presetting of brd_id, set the corresponding hdw_id */ 74 74 75 75 void 76 - sbeid_set_hdwbid (ci_t * ci) 76 + sbeid_set_hdwbid (ci_t *ci) 77 77 { 78 78 /* 79 79 * set SBE's unique hardware identification (for legacy boards might not ··· 170 170 /* given the presetting of hdw_bid, set the corresponding brd_id */ 171 171 172 172 void 173 - sbeid_set_bdtype (ci_t * ci) 173 + sbeid_set_bdtype (ci_t *ci) 174 174 { 175 175 /* set SBE's unique PCI VENDOR/DEVID */ 176 176 switch (ci->hdw_bid)
+2 -2
drivers/staging/cxt1e1/sbeproc.h
··· 28 28 29 29 #else 30 30 31 - static inline void sbecom_proc_brd_cleanup(ci_t * ci) 31 + static inline void sbecom_proc_brd_cleanup(ci_t *ci) 32 32 { 33 33 } 34 34 35 - static inline int __init sbecom_proc_brd_init(ci_t * ci) 35 + static inline int __init sbecom_proc_brd_init(ci_t *ci) 36 36 { 37 37 return 0; 38 38 }