staging: ft1000: fix remaining checkpatch issues in ft1000_hw.c
The file ft1000_hw.c is still full of coding style problems that make it challenging to read and understand. The lines inside the switch cases in ft1000_proc_drvmsg() are indented too deeply, so remove one leading tab. Join lines that are now able to fit in the 80 character limit. This will take care of the "too many leading tabs" issue. Run checkpatch.pl on the file, and correct all other issues it reports (except lines with user visible strings over 80 chars). Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com> Suggested-by: Waskiewicz Jr, Peter P <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kelley Nielsen
Greg Kroah-Hartman
parent
a3220b89bd
commit
8d6c558557
1 changed files with 194 additions and 232 deletions
|
|
@ -25,7 +25,9 @@
|
|||
#define HARLEY_READ_OPERATION 0xc1
|
||||
#define HARLEY_WRITE_OPERATION 0x41
|
||||
|
||||
//#define JDEBUG
|
||||
#if 0
|
||||
#define JDEBUG
|
||||
#endif
|
||||
|
||||
static int ft1000_submit_rx_urb(struct ft1000_info *info);
|
||||
|
||||
|
|
@ -169,7 +171,8 @@ int ft1000_read_dpram16(struct ft1000_usb *ft1000dev, u16 indx, u8 *buffer,
|
|||
}
|
||||
|
||||
/* write into DPRAM a number of bytes */
|
||||
int ft1000_write_dpram16(struct ft1000_usb *ft1000dev, u16 indx, u16 value, u8 highlow)
|
||||
int ft1000_write_dpram16(struct ft1000_usb *ft1000dev, u16 indx, u16 value,
|
||||
u8 highlow)
|
||||
{
|
||||
int ret = 0;
|
||||
u8 request;
|
||||
|
|
@ -334,7 +337,7 @@ void card_send_command(struct ft1000_usb *ft1000dev, void *ptempbuffer,
|
|||
ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL);
|
||||
|
||||
if (temp & 0x0100)
|
||||
msleep(10);
|
||||
usleep_range(900, 1100);
|
||||
|
||||
/* check for odd word */
|
||||
size = size + 2;
|
||||
|
|
@ -344,16 +347,17 @@ void card_send_command(struct ft1000_usb *ft1000dev, void *ptempbuffer,
|
|||
size += 4 - (size % 4);
|
||||
|
||||
ft1000_write_dpram32(ft1000dev, 0, commandbuf, size);
|
||||
msleep(1);
|
||||
usleep_range(900, 1100);
|
||||
ft1000_write_register(ft1000dev, FT1000_DB_DPRAM_TX,
|
||||
FT1000_REG_DOORBELL);
|
||||
msleep(1);
|
||||
usleep_range(900, 1100);
|
||||
|
||||
ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL);
|
||||
|
||||
if ((temp & 0x0100) == 0) {
|
||||
//DEBUG("card_send_command: Message sent\n");
|
||||
}
|
||||
#if 0
|
||||
if ((temp & 0x0100) == 0)
|
||||
DEBUG("card_send_command: Message sent\n");
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -641,8 +645,7 @@ static struct net_device_stats *ft1000_netdev_stats(struct net_device *dev)
|
|||
return &(info->stats);
|
||||
}
|
||||
|
||||
static const struct net_device_ops ftnet_ops =
|
||||
{
|
||||
static const struct net_device_ops ftnet_ops = {
|
||||
.ndo_open = &ft1000_open,
|
||||
.ndo_stop = &ft1000_close,
|
||||
.ndo_start_xmit = &ft1000_start_xmit,
|
||||
|
|
@ -687,14 +690,14 @@ int init_ft1000_netdev(struct ft1000_usb *ft1000dev)
|
|||
card_nr[1] = '\0';
|
||||
ret_val = kstrtou8(card_nr, 10, &gCardIndex);
|
||||
if (ret_val) {
|
||||
printk(KERN_ERR "Can't parse netdev\n");
|
||||
netdev_err(ft1000dev->net, "Can't parse netdev\n");
|
||||
goto err_net;
|
||||
}
|
||||
|
||||
ft1000dev->CardNumber = gCardIndex;
|
||||
DEBUG("card number = %d\n", ft1000dev->CardNumber);
|
||||
} else {
|
||||
printk(KERN_ERR "ft1000: Invalid device name\n");
|
||||
netdev_err(ft1000dev->net, "ft1000: Invalid device name\n");
|
||||
ret_val = -ENXIO;
|
||||
goto err_net;
|
||||
}
|
||||
|
|
@ -825,7 +828,7 @@ static int ft1000_copy_up_pkt(struct urb *urb)
|
|||
DEBUG("network driver is closed, return\n");
|
||||
return 0;
|
||||
}
|
||||
// Read length
|
||||
/* Read length */
|
||||
len = urb->transfer_buffer_length;
|
||||
lena = urb->actual_length;
|
||||
|
||||
|
|
@ -942,8 +945,7 @@ static int ft1000_chkcard(struct ft1000_usb *dev)
|
|||
int status;
|
||||
|
||||
if (dev->fCondResetPend) {
|
||||
DEBUG
|
||||
("ft1000_hw:ft1000_chkcard:Card is being reset, return FALSE\n");
|
||||
DEBUG("ft1000_hw:ft1000_chkcard:Card is being reset, return FALSE\n");
|
||||
return TRUE;
|
||||
}
|
||||
/* Mask register is used to check for device presence since it is never
|
||||
|
|
@ -951,8 +953,7 @@ static int ft1000_chkcard(struct ft1000_usb *dev)
|
|||
*/
|
||||
status = ft1000_read_register(dev, &tempword, FT1000_REG_SUP_IMASK);
|
||||
if (tempword == 0) {
|
||||
DEBUG
|
||||
("ft1000_hw:ft1000_chkcard: IMASK = 0 Card not detected\n");
|
||||
DEBUG("ft1000_hw:ft1000_chkcard: IMASK = 0 Card not detected\n");
|
||||
return FALSE;
|
||||
}
|
||||
/* The system will return the value of 0xffff for the version register
|
||||
|
|
@ -961,8 +962,7 @@ static int ft1000_chkcard(struct ft1000_usb *dev)
|
|||
status = ft1000_read_register(dev, &tempword, FT1000_REG_ASIC_ID);
|
||||
if (tempword != 0x1b01) {
|
||||
dev->status |= FT1000_STATUS_CLOSING;
|
||||
DEBUG
|
||||
("ft1000_hw:ft1000_chkcard: Version = 0xffff Card not detected\n");
|
||||
DEBUG("ft1000_hw:ft1000_chkcard: Version = 0xffff Card not detected\n");
|
||||
return FALSE;
|
||||
}
|
||||
return TRUE;
|
||||
|
|
@ -1095,9 +1095,8 @@ static int ft1000_dsp_prov(void *arg)
|
|||
ppseudo_hdr->portsrc = 0;
|
||||
/* Calculate new checksum */
|
||||
ppseudo_hdr->checksum = *pmsg++;
|
||||
for (i = 1; i < 7; i++) {
|
||||
for (i = 1; i < 7; i++)
|
||||
ppseudo_hdr->checksum ^= *pmsg++;
|
||||
}
|
||||
|
||||
TempShortBuf[0] = 0;
|
||||
TempShortBuf[1] = htons(len);
|
||||
|
|
@ -1115,7 +1114,7 @@ static int ft1000_dsp_prov(void *arg)
|
|||
kfree(ptr->pprov_data);
|
||||
kfree(ptr);
|
||||
}
|
||||
msleep(10);
|
||||
usleep_range(9000, 11000);
|
||||
}
|
||||
|
||||
DEBUG("DSP Provisioning List Entry finished\n");
|
||||
|
|
@ -1171,26 +1170,21 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size)
|
|||
DEBUG("ft1000_proc_drvmsg:Command message type = 0x%x\n", msgtype);
|
||||
switch (msgtype) {
|
||||
case MEDIA_STATE:{
|
||||
DEBUG
|
||||
("ft1000_proc_drvmsg:Command message type = MEDIA_STATE");
|
||||
|
||||
DEBUG("ft1000_proc_drvmsg:Command message type = MEDIA_STATE");
|
||||
pmediamsg = (struct media_msg *)&cmdbuffer[0];
|
||||
if (info->ProgConStat != 0xFF) {
|
||||
if (pmediamsg->state) {
|
||||
DEBUG("Media is up\n");
|
||||
if (info->mediastate == 0) {
|
||||
if (dev->NetDevRegDone) {
|
||||
netif_wake_queue(dev->
|
||||
net);
|
||||
}
|
||||
if (dev->NetDevRegDone)
|
||||
netif_wake_queue(dev->net);
|
||||
info->mediastate = 1;
|
||||
}
|
||||
} else {
|
||||
DEBUG("Media is down\n");
|
||||
if (info->mediastate == 1) {
|
||||
info->mediastate = 0;
|
||||
if (dev->NetDevRegDone) {
|
||||
}
|
||||
if (dev->NetDevRegDone)
|
||||
info->ConTm = 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -1204,9 +1198,7 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size)
|
|||
break;
|
||||
}
|
||||
case DSP_INIT_MSG:{
|
||||
DEBUG
|
||||
("ft1000_proc_drvmsg:Command message type = DSP_INIT_MSG");
|
||||
|
||||
DEBUG("ft1000_proc_drvmsg:Command message type = DSP_INIT_MSG");
|
||||
pdspinitmsg = (struct dsp_init_msg *)&cmdbuffer[2];
|
||||
memcpy(info->DspVer, pdspinitmsg->DspVer, DSPVERSZ);
|
||||
DEBUG("DSPVER = 0x%2x 0x%2x 0x%2x 0x%2x\n",
|
||||
|
|
@ -1229,20 +1221,18 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size)
|
|||
|
||||
if (ntohs(pdspinitmsg->length) ==
|
||||
(sizeof(struct dsp_init_msg) - 20)) {
|
||||
memcpy(info->ProductMode,
|
||||
pdspinitmsg->ProductMode, MODESZ);
|
||||
memcpy(info->RfCalVer, pdspinitmsg->RfCalVer,
|
||||
CALVERSZ);
|
||||
memcpy(info->ProductMode, pdspinitmsg->ProductMode,
|
||||
MODESZ);
|
||||
memcpy(info->RfCalVer, pdspinitmsg->RfCalVer, CALVERSZ);
|
||||
memcpy(info->RfCalDate, pdspinitmsg->RfCalDate,
|
||||
CALDATESZ);
|
||||
DEBUG("RFCalVer = 0x%2x 0x%2x\n",
|
||||
info->RfCalVer[0], info->RfCalVer[1]);
|
||||
DEBUG("RFCalVer = 0x%2x 0x%2x\n", info->RfCalVer[0],
|
||||
info->RfCalVer[1]);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DSP_PROVISION:{
|
||||
DEBUG
|
||||
("ft1000_proc_drvmsg:Command message type = DSP_PROVISION\n");
|
||||
DEBUG("ft1000_proc_drvmsg:Command message type = DSP_PROVISION\n");
|
||||
|
||||
/* kick off dspprov routine to start provisioning
|
||||
* Send provisioning data to DSP
|
||||
|
|
@ -1254,28 +1244,22 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size)
|
|||
goto out;
|
||||
} else {
|
||||
dev->fProvComplete = true;
|
||||
status =
|
||||
ft1000_write_register(dev, FT1000_DB_HB,
|
||||
status = ft1000_write_register(dev, FT1000_DB_HB,
|
||||
FT1000_REG_DOORBELL);
|
||||
DEBUG
|
||||
("FT1000:drivermsg:No more DSP provisioning data in dsp image\n");
|
||||
DEBUG("FT1000:drivermsg:No more DSP provisioning data in dsp image\n");
|
||||
}
|
||||
DEBUG("ft1000_proc_drvmsg:DSP PROVISION is done\n");
|
||||
break;
|
||||
}
|
||||
case DSP_STORE_INFO:{
|
||||
DEBUG
|
||||
("ft1000_proc_drvmsg:Command message type = DSP_STORE_INFO");
|
||||
|
||||
DEBUG("ft1000_proc_drvmsg:Command message type = DSP_STORE_INFO");
|
||||
DEBUG("FT1000:drivermsg:Got DSP_STORE_INFO\n");
|
||||
tempword = ntohs(pdrvmsg->length);
|
||||
info->DSPInfoBlklen = tempword;
|
||||
if (tempword < (MAX_DSP_SESS_REC - 4)) {
|
||||
pmsg = (u16 *) &pdrvmsg->data[0];
|
||||
for (i = 0; i < ((tempword + 1) / 2); i++) {
|
||||
DEBUG
|
||||
("FT1000:drivermsg:dsp info data = 0x%x\n",
|
||||
*pmsg);
|
||||
DEBUG("FT1000:drivermsg:dsp info data = 0x%x\n", *pmsg);
|
||||
info->DSPInfoBlk[i + 10] = *pmsg++;
|
||||
}
|
||||
} else {
|
||||
|
|
@ -1289,36 +1273,28 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size)
|
|||
dev->DrvMsgPend = 1;
|
||||
/* allow any outstanding ioctl to finish */
|
||||
mdelay(10);
|
||||
status =
|
||||
ft1000_read_register(dev, &tempword,
|
||||
status = ft1000_read_register(dev, &tempword,
|
||||
FT1000_REG_DOORBELL);
|
||||
if (tempword & FT1000_DB_DPRAM_TX) {
|
||||
mdelay(10);
|
||||
status =
|
||||
ft1000_read_register(dev, &tempword,
|
||||
status = ft1000_read_register(dev, &tempword,
|
||||
FT1000_REG_DOORBELL);
|
||||
if (tempword & FT1000_DB_DPRAM_TX) {
|
||||
mdelay(10);
|
||||
status =
|
||||
ft1000_read_register(dev, &tempword,
|
||||
status = ft1000_read_register(dev, &tempword,
|
||||
FT1000_REG_DOORBELL);
|
||||
if (tempword & FT1000_DB_DPRAM_TX)
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* Put message into Slow Queue
|
||||
* Form Pseudo header
|
||||
*/
|
||||
/* Put message into Slow Queue Form Pseudo header */
|
||||
pmsg = (u16 *) info->DSPInfoBlk;
|
||||
*pmsg++ = 0;
|
||||
*pmsg++ =
|
||||
htons(info->DSPInfoBlklen + 20 +
|
||||
info->DSPInfoBlklen);
|
||||
*pmsg++ = htons(info->DSPInfoBlklen + 20 + info->DSPInfoBlklen);
|
||||
ppseudo_hdr =
|
||||
(struct pseudo_hdr *)(u16 *) &info->DSPInfoBlk[2];
|
||||
ppseudo_hdr->length =
|
||||
htons(info->DSPInfoBlklen + 4 +
|
||||
info->DSPInfoBlklen);
|
||||
ppseudo_hdr->length = htons(info->DSPInfoBlklen + 4
|
||||
+ info->DSPInfoBlklen);
|
||||
ppseudo_hdr->source = 0x10;
|
||||
ppseudo_hdr->destination = 0x20;
|
||||
ppseudo_hdr->portdest = 0;
|
||||
|
|
@ -1339,42 +1315,31 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size)
|
|||
|
||||
info->DSPInfoBlk[10] = 0x7200;
|
||||
info->DSPInfoBlk[11] = htons(info->DSPInfoBlklen);
|
||||
status =
|
||||
ft1000_write_dpram32(dev, 0,
|
||||
status = ft1000_write_dpram32(dev, 0,
|
||||
(u8 *)&info->DSPInfoBlk[0],
|
||||
(unsigned short)(info->
|
||||
DSPInfoBlklen
|
||||
+ 22));
|
||||
status =
|
||||
ft1000_write_register(dev, FT1000_DB_DPRAM_TX,
|
||||
(unsigned short)(info->DSPInfoBlklen + 22));
|
||||
status = ft1000_write_register(dev, FT1000_DB_DPRAM_TX,
|
||||
FT1000_REG_DOORBELL);
|
||||
dev->DrvMsgPend = 0;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case GET_DRV_ERR_RPT_MSG:{
|
||||
DEBUG("FT1000:drivermsg:Got GET_DRV_ERR_RPT_MSG\n");
|
||||
/* copy driver error message to dsp */
|
||||
dev->DrvMsgPend = 1;
|
||||
/* allow any outstanding ioctl to finish */
|
||||
mdelay(10);
|
||||
status =
|
||||
ft1000_read_register(dev, &tempword,
|
||||
status = ft1000_read_register(dev, &tempword,
|
||||
FT1000_REG_DOORBELL);
|
||||
if (tempword & FT1000_DB_DPRAM_TX) {
|
||||
mdelay(10);
|
||||
status =
|
||||
ft1000_read_register(dev, &tempword,
|
||||
status = ft1000_read_register(dev, &tempword,
|
||||
FT1000_REG_DOORBELL);
|
||||
if (tempword & FT1000_DB_DPRAM_TX)
|
||||
mdelay(10);
|
||||
}
|
||||
|
||||
if ((tempword & FT1000_DB_DPRAM_TX) == 0) {
|
||||
/* Put message into Slow Queue
|
||||
* Form Pseudo header
|
||||
*/
|
||||
/* Put message into Slow Queue Form Pseudo header */
|
||||
pmsg = (u16 *) &tempbuffer[0];
|
||||
ppseudo_hdr = (struct pseudo_hdr *)pmsg;
|
||||
ppseudo_hdr->length = htons(0x0012);
|
||||
|
|
@ -1411,16 +1376,13 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size)
|
|||
*pmsg++ = convert.wrd;
|
||||
*pmsg++ = htons(info->DrvErrNum);
|
||||
|
||||
card_send_command(dev,
|
||||
(unsigned char *)&tempbuffer[0],
|
||||
card_send_command(dev, (unsigned char *)&tempbuffer[0],
|
||||
(u16)(0x0012 + PSEUDOSZ));
|
||||
info->DrvErrNum = 0;
|
||||
}
|
||||
dev->DrvMsgPend = 0;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue