mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 18:39:59 +00:00
Code Issues Releases Wiki Activity

staging: ft1000: Fix coding style in card_send_command function.

Browse source 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Marek Belisko 2011-03-10 11:51:16 +01:00 committed by Greg Kroah-Hartman
parent a209efadf0
commit 68e79bccce
1 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
View file

@ -481,51 +481,47 @@ static void card_reset_dsp(struct ft1000_device *ft1000dev, bool value)
// Notes:
//
//---------------------------------------------------------------------------
void card_send_command(struct ft1000_device *ft1000dev, void *ptempbuffer, int size)
void card_send_command(struct ft1000_device *ft1000dev, void *ptempbuffer,
int size)
{
unsigned short temp;
unsigned char *commandbuf;
unsigned short temp;
unsigned char *commandbuf;
DEBUG("card_send_command: enter card_send_command... size=%d\n", size);
DEBUG("card_send_command: enter card_send_command... size=%d\n", size);
commandbuf =(unsigned char*) kmalloc(size+2, GFP_KERNEL);
memcpy((void*)commandbuf+2, (void*)ptempbuffer, size);
commandbuf = (unsigned char *)kmalloc(size + 2, GFP_KERNEL);
memcpy((void *)commandbuf + 2, (void *)ptempbuffer, size);
//DEBUG("card_send_command: Command Send\n");
//DEBUG("card_send_command: Command Send\n");
ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL);
ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL);
if (temp & 0x0100)
{
msleep(10);
}
if (temp & 0x0100)
msleep(10);
// check for odd word
size = size + 2;
if (size % 4)
{
// Must force to be 32 bit aligned
size += 4 - (size % 4);
}
/* check for odd word */
size = size + 2;
/* Must force to be 32 bit aligned */
if (size % 4)
size += 4 - (size % 4);
//DEBUG("card_send_command: write dpram ... size=%d\n", size);
ft1000_write_dpram32(ft1000dev, 0,commandbuf, size);
msleep(1);
//DEBUG("card_send_command: write into doorbell ...\n");
ft1000_write_register(ft1000dev, FT1000_DB_DPRAM_TX ,FT1000_REG_DOORBELL) ;
msleep(1);
//DEBUG("card_send_command: write dpram ... size=%d\n", size);
ft1000_write_dpram32(ft1000dev, 0, commandbuf, size);
msleep(1);
//DEBUG("card_send_command: write into doorbell ...\n");
ft1000_write_register(ft1000dev, FT1000_DB_DPRAM_TX,
FT1000_REG_DOORBELL);
msleep(1);
ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL);
//DEBUG("card_send_command: read doorbell ...temp=%x\n", temp);
if ( (temp & 0x0100) == 0)
{
//DEBUG("card_send_command: Message sent\n");
}
ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL);
//DEBUG("card_send_command: read doorbell ...temp=%x\n", temp);
if ((temp & 0x0100) == 0) {
//DEBUG("card_send_command: Message sent\n");
}
}
//--------------------------------------------------------------------------
//
// Function: dsp_reload