Commit 7b174df6 authored by Michał Kępień's avatar Michał Kępień Committed by Greg Kroah-Hartman

staging: ft1000: ft1000-usb: ft1000_hw.c: fix long lines

Fix checkpatch.pl warnings about lines longer than 80 characters.
Signed-off-by: default avatarMichał Kępień <kernel@kempniu.pl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f0feeaff
...@@ -399,8 +399,8 @@ int dsp_reload(struct ft1000_usb *ft1000dev) ...@@ -399,8 +399,8 @@ int dsp_reload(struct ft1000_usb *ft1000dev)
card_reset_dsp(ft1000dev, 0); card_reset_dsp(ft1000dev, 0);
msleep(1000); msleep(1000);
status = status = ft1000_write_register(ft1000dev, HOST_INTF_BE,
ft1000_write_register(ft1000dev, HOST_INTF_BE, FT1000_REG_SUP_CTRL); FT1000_REG_SUP_CTRL);
/* Let's check for FEFE */ /* Let's check for FEFE */
status = status =
...@@ -587,8 +587,8 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -587,8 +587,8 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
goto err; goto err;
} }
pipe = pipe = usb_sndbulkpipe(pFt1000Dev->dev,
usb_sndbulkpipe(pFt1000Dev->dev, pFt1000Dev->bulk_out_endpointAddr); pFt1000Dev->bulk_out_endpointAddr);
maxlen = usb_maxpacket(pFt1000Dev->dev, pipe, usb_pipeout(pipe)); maxlen = usb_maxpacket(pFt1000Dev->dev, pipe, usb_pipeout(pipe));
pdata = (u8 *)skb->data; pdata = (u8 *)skb->data;
...@@ -1049,8 +1049,8 @@ static int ft1000_dsp_prov(void *arg) ...@@ -1049,8 +1049,8 @@ static int ft1000_dsp_prov(void *arg)
/* Check if doorbell is available */ /* Check if doorbell is available */
pr_debug("check if doorbell is cleared\n"); pr_debug("check if doorbell is cleared\n");
status = status = ft1000_read_register(dev, &tempword,
ft1000_read_register(dev, &tempword, FT1000_REG_DOORBELL); FT1000_REG_DOORBELL);
if (status) { if (status) {
pr_debug("ft1000_read_register error\n"); pr_debug("ft1000_read_register error\n");
break; break;
...@@ -1071,9 +1071,8 @@ static int ft1000_dsp_prov(void *arg) ...@@ -1071,9 +1071,8 @@ static int ft1000_dsp_prov(void *arg)
pr_debug("*** Provision Data Sent to DSP\n"); pr_debug("*** Provision Data Sent to DSP\n");
/* Send provisioning data */ /* Send provisioning data */
ptr = ptr = list_entry(info->prov_list.next,
list_entry(info->prov_list.next, struct prov_record, struct prov_record, list);
list);
len = *(u16 *)ptr->pprov_data; len = *(u16 *)ptr->pprov_data;
len = htons(len); len = htons(len);
len += PSEUDOSZ; len += PSEUDOSZ;
...@@ -1261,7 +1260,7 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size) ...@@ -1261,7 +1260,7 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size)
if (tempword & FT1000_DB_DPRAM_TX) { if (tempword & FT1000_DB_DPRAM_TX) {
mdelay(10); mdelay(10);
status = ft1000_read_register(dev, &tempword, status = ft1000_read_register(dev, &tempword,
FT1000_REG_DOORBELL); FT1000_REG_DOORBELL);
if (tempword & FT1000_DB_DPRAM_TX) if (tempword & FT1000_DB_DPRAM_TX)
break; break;
} }
...@@ -1295,8 +1294,8 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size) ...@@ -1295,8 +1294,8 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size)
info->DSPInfoBlk[10] = 0x7200; info->DSPInfoBlk[10] = 0x7200;
info->DSPInfoBlk[11] = htons(info->DSPInfoBlklen); info->DSPInfoBlk[11] = htons(info->DSPInfoBlklen);
status = ft1000_write_dpram32(dev, 0, status = ft1000_write_dpram32(dev, 0,
(u8 *)&info->DSPInfoBlk[0], (u8 *)&info->DSPInfoBlk[0],
(unsigned short)(info->DSPInfoBlklen + 22)); (unsigned short)(info->DSPInfoBlklen + 22));
status = ft1000_write_register(dev, FT1000_DB_DPRAM_TX, status = ft1000_write_register(dev, FT1000_DB_DPRAM_TX,
FT1000_REG_DOORBELL); FT1000_REG_DOORBELL);
dev->DrvMsgPend = 0; dev->DrvMsgPend = 0;
...@@ -1355,8 +1354,9 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size) ...@@ -1355,8 +1354,9 @@ static int ft1000_proc_drvmsg(struct ft1000_usb *dev, u16 size)
*pmsg++ = convert.wrd; *pmsg++ = convert.wrd;
*pmsg++ = htons(info->DrvErrNum); *pmsg++ = htons(info->DrvErrNum);
status = card_send_command(dev, (unsigned char *)&tempbuffer[0], status = card_send_command(dev,
(u16)(0x0012 + PSEUDOSZ)); (unsigned char *)&tempbuffer[0],
(u16)(0x0012 + PSEUDOSZ));
if (status) if (status)
goto out; goto out;
info->DrvErrNum = 0; info->DrvErrNum = 0;
...@@ -1526,7 +1526,7 @@ int ft1000_poll(void *dev_id) ...@@ -1526,7 +1526,7 @@ int ft1000_poll(void *dev_id)
usleep_range(9000, 11000); usleep_range(9000, 11000);
/* Program WMARK register */ /* Program WMARK register */
status = ft1000_write_register(dev, 0x600, status = ft1000_write_register(dev, 0x600,
FT1000_REG_MAG_WATERMARK); FT1000_REG_MAG_WATERMARK);
/* clear ASIC reset doorbell */ /* clear ASIC reset doorbell */
status = ft1000_write_register(dev, status = ft1000_write_register(dev,
FT1000_DSP_ASIC_RESET, FT1000_DSP_ASIC_RESET,
...@@ -1542,9 +1542,9 @@ int ft1000_poll(void *dev_id) ...@@ -1542,9 +1542,9 @@ int ft1000_poll(void *dev_id)
FT1000_REG_SUP_CTRL); FT1000_REG_SUP_CTRL);
/* copy dsp session record from Adapter block */ /* copy dsp session record from Adapter block */
status = ft1000_write_dpram32(dev, 0, status = ft1000_write_dpram32(dev, 0,
(u8 *)&info->DSPSess.Rec[0], 1024); (u8 *)&info->DSPSess.Rec[0], 1024);
status = ft1000_write_register(dev, 0x600, status = ft1000_write_register(dev, 0x600,
FT1000_REG_MAG_WATERMARK); FT1000_REG_MAG_WATERMARK);
/* ring doorbell to tell DSP that /* ring doorbell to tell DSP that
* ASIC is out of reset * ASIC is out of reset
* */ * */
...@@ -1556,21 +1556,21 @@ int ft1000_poll(void *dev_id) ...@@ -1556,21 +1556,21 @@ int ft1000_poll(void *dev_id)
if (!dev->fAppMsgPend) { if (!dev->fAppMsgPend) {
/* Reset ASIC and DSP */ /* Reset ASIC and DSP */
status = ft1000_read_dpram16(dev, status = ft1000_read_dpram16(dev,
FT1000_MAG_DSP_TIMER0, FT1000_MAG_DSP_TIMER0,
(u8 *)&info->DSP_TIME[0], (u8 *)&info->DSP_TIME[0],
FT1000_MAG_DSP_TIMER0_INDX); FT1000_MAG_DSP_TIMER0_INDX);
status = ft1000_read_dpram16(dev, status = ft1000_read_dpram16(dev,
FT1000_MAG_DSP_TIMER1, FT1000_MAG_DSP_TIMER1,
(u8 *)&info->DSP_TIME[1], (u8 *)&info->DSP_TIME[1],
FT1000_MAG_DSP_TIMER1_INDX); FT1000_MAG_DSP_TIMER1_INDX);
status = ft1000_read_dpram16(dev, status = ft1000_read_dpram16(dev,
FT1000_MAG_DSP_TIMER2, FT1000_MAG_DSP_TIMER2,
(u8 *)&info->DSP_TIME[2], (u8 *)&info->DSP_TIME[2],
FT1000_MAG_DSP_TIMER2_INDX); FT1000_MAG_DSP_TIMER2_INDX);
status = ft1000_read_dpram16(dev, status = ft1000_read_dpram16(dev,
FT1000_MAG_DSP_TIMER3, FT1000_MAG_DSP_TIMER3,
(u8 *)&info->DSP_TIME[3], (u8 *)&info->DSP_TIME[3],
FT1000_MAG_DSP_TIMER3_INDX); FT1000_MAG_DSP_TIMER3_INDX);
info->CardReady = 0; info->CardReady = 0;
info->DrvErrNum = DSP_CONDRESET_INFO; info->DrvErrNum = DSP_CONDRESET_INFO;
pr_debug("DSP conditional reset requested\n"); pr_debug("DSP conditional reset requested\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment