aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Belisko <marek.belisko@open-nandra.com>2011-03-10 05:51:15 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-14 14:51:14 -0400
commita209efadf0b93238fe052fe1e92f48ccf6da57a1 (patch)
tree68e946edeb7d9e069237e522bc0a8b48ff8ef89a
parent2b61535a6e210358255c872b3187e48869e16e27 (diff)
staging: ft1000: Replace camelcase CardSendCommand function name.
Replace CardSendCommand by card_send_command. Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_debug.c6
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_hw.c18
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_usb.h2
3 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
index 149ba59f96b..19db23fe73c 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
@@ -471,14 +471,14 @@ static long ft1000_ioctl (struct file *file, unsigned int command,
471 // Connect Message 471 // Connect Message
472 DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_CONNECT\n"); 472 DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_CONNECT\n");
473 ConnectionMsg[79] = 0xfc; 473 ConnectionMsg[79] = 0xfc;
474 CardSendCommand(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c); 474 card_send_command(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c);
475 475
476 break; 476 break;
477 case IOCTL_DISCONNECT: 477 case IOCTL_DISCONNECT:
478 // Disconnect Message 478 // Disconnect Message
479 DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_DISCONNECT\n"); 479 DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_DISCONNECT\n");
480 ConnectionMsg[79] = 0xfd; 480 ConnectionMsg[79] = 0xfd;
481 CardSendCommand(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c); 481 card_send_command(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c);
482 break; 482 break;
483 case IOCTL_GET_DSP_STAT_CMD: 483 case IOCTL_GET_DSP_STAT_CMD:
484 //DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_GET_DSP_STAT called\n"); 484 //DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_GET_DSP_STAT called\n");
@@ -642,7 +642,7 @@ static long ft1000_ioctl (struct file *file, unsigned int command,
642 } 642 }
643 pmsg++; 643 pmsg++;
644 ppseudo_hdr = (struct pseudo_hdr *)pmsg; 644 ppseudo_hdr = (struct pseudo_hdr *)pmsg;
645 CardSendCommand(ft1000dev,(unsigned short*)dpram_data,total_len+2); 645 card_send_command(ft1000dev,(unsigned short*)dpram_data,total_len+2);
646 646
647 647
648 info->app_info[app_index].nTxMsg++; 648 info->app_info[app_index].nTxMsg++;
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index e3b99347ff7..293a469fadc 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -467,7 +467,7 @@ static void card_reset_dsp(struct ft1000_device *ft1000dev, bool value)
467} 467}
468 468
469//--------------------------------------------------------------------------- 469//---------------------------------------------------------------------------
470// Function: CardSendCommand 470// Function: card_send_command
471// 471//
472// Parameters: ft1000_device - device structure 472// Parameters: ft1000_device - device structure
473// ptempbuffer - command buffer 473// ptempbuffer - command buffer
@@ -481,17 +481,17 @@ static void card_reset_dsp(struct ft1000_device *ft1000dev, bool value)
481// Notes: 481// Notes:
482// 482//
483//--------------------------------------------------------------------------- 483//---------------------------------------------------------------------------
484void CardSendCommand(struct ft1000_device *ft1000dev, void *ptempbuffer, int size) 484void card_send_command(struct ft1000_device *ft1000dev, void *ptempbuffer, int size)
485{ 485{
486 unsigned short temp; 486 unsigned short temp;
487 unsigned char *commandbuf; 487 unsigned char *commandbuf;
488 488
489 DEBUG("CardSendCommand: enter CardSendCommand... size=%d\n", size); 489 DEBUG("card_send_command: enter card_send_command... size=%d\n", size);
490 490
491 commandbuf =(unsigned char*) kmalloc(size+2, GFP_KERNEL); 491 commandbuf =(unsigned char*) kmalloc(size+2, GFP_KERNEL);
492 memcpy((void*)commandbuf+2, (void*)ptempbuffer, size); 492 memcpy((void*)commandbuf+2, (void*)ptempbuffer, size);
493 493
494 //DEBUG("CardSendCommand: Command Send\n"); 494 //DEBUG("card_send_command: Command Send\n");
495 495
496 ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL); 496 ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL);
497 497
@@ -509,18 +509,18 @@ void CardSendCommand(struct ft1000_device *ft1000dev, void *ptempbuffer, int siz
509 } 509 }
510 510
511 511
512 //DEBUG("CardSendCommand: write dpram ... size=%d\n", size); 512 //DEBUG("card_send_command: write dpram ... size=%d\n", size);
513 ft1000_write_dpram32(ft1000dev, 0,commandbuf, size); 513 ft1000_write_dpram32(ft1000dev, 0,commandbuf, size);
514 msleep(1); 514 msleep(1);
515 //DEBUG("CardSendCommand: write into doorbell ...\n"); 515 //DEBUG("card_send_command: write into doorbell ...\n");
516 ft1000_write_register(ft1000dev, FT1000_DB_DPRAM_TX ,FT1000_REG_DOORBELL) ; 516 ft1000_write_register(ft1000dev, FT1000_DB_DPRAM_TX ,FT1000_REG_DOORBELL) ;
517 msleep(1); 517 msleep(1);
518 518
519 ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL); 519 ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL);
520 //DEBUG("CardSendCommand: read doorbell ...temp=%x\n", temp); 520 //DEBUG("card_send_command: read doorbell ...temp=%x\n", temp);
521 if ( (temp & 0x0100) == 0) 521 if ( (temp & 0x0100) == 0)
522 { 522 {
523 //DEBUG("CardSendCommand: Message sent\n"); 523 //DEBUG("card_send_command: Message sent\n");
524 } 524 }
525 525
526} 526}
@@ -1811,7 +1811,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
1811 *pmsg++ = convert.wrd; 1811 *pmsg++ = convert.wrd;
1812 *pmsg++ = htons(info->DrvErrNum); 1812 *pmsg++ = htons(info->DrvErrNum);
1813 1813
1814 CardSendCommand (dev, (unsigned char*)&tempbuffer[0], (u16)(0x0012 + PSEUDOSZ)); 1814 card_send_command (dev, (unsigned char*)&tempbuffer[0], (u16)(0x0012 + PSEUDOSZ));
1815 info->DrvErrNum = 0; 1815 info->DrvErrNum = 0;
1816 } 1816 }
1817 info->DrvMsgPend = 0; 1817 info->DrvMsgPend = 0;
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 88183fe142a..84ff53d2e2c 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -581,7 +581,7 @@ extern spinlock_t free_buff_lock; // lock to arbitrate free buffer list for re
581 581
582int ft1000_create_dev(struct ft1000_device *dev); 582int ft1000_create_dev(struct ft1000_device *dev);
583void ft1000_destroy_dev(struct net_device *dev); 583void ft1000_destroy_dev(struct net_device *dev);
584extern void CardSendCommand(struct ft1000_device *ft1000dev, void *ptempbuffer, int size); 584extern void card_send_command(struct ft1000_device *ft1000dev, void *ptempbuffer, int size);
585 585
586struct dpram_blk *ft1000_get_buffer(struct list_head *bufflist); 586struct dpram_blk *ft1000_get_buffer(struct list_head *bufflist);
587void ft1000_free_buffer(struct dpram_blk *pdpram_blk, struct list_head *plist); 587void ft1000_free_buffer(struct dpram_blk *pdpram_blk, struct list_head *plist);