2014-12-02 23:52:23

by Sean Cleator

Subject: [PATCH] Staging: slicoss: Fix long line issues in slicoss.c

A patch to the slicoss.c file to fix some of the long line issues found by the
checkpath.pl tool
Signed-off-by: Sean Cleator <[email protected]>

---
drivers/staging/slicoss/slicoss.c | 39 ++++++++++++++++++++++++++-------------
1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 56ca3b6..4df4a7e 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -498,12 +498,14 @@ static int slic_card_download(struct adapter *adapter)
slic_reg32_write(&slic_regs->slic_wcs,
baseaddress + codeaddr, FLUSH);
/* Write out instruction to low addr */
- slic_reg32_write(&slic_regs->slic_wcs, instruction, FLUSH);
+ slic_reg32_write(&slic_regs->slic_wcs,
+ instruction, FLUSH);
instruction = *(u32 *)(fw->data + index);
index += 4;

/* Write out instruction to high addr */
- slic_reg32_write(&slic_regs->slic_wcs, instruction, FLUSH);
+ slic_reg32_write(&slic_regs->slic_wcs,
+ instruction, FLUSH);
instruction = *(u32 *)(fw->data + index);
index += 4;
}
@@ -1533,14 +1535,18 @@ retry_rcvqfill:
dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
__func__);
dev_err(dev, "skb[%p] PROBLEM\n", skb);
- dev_err(dev, " skbdata[%p]\n", skb->data);
+ dev_err(dev, " skbdata[%p]\n",
+ skb->data);
dev_err(dev, " skblen[%x]\n", skb->len);
dev_err(dev, " paddr[%p]\n", paddr);
dev_err(dev, " paddrl[%x]\n", paddrl);
dev_err(dev, " paddrh[%x]\n", paddrh);
- dev_err(dev, " rcvq->head[%p]\n", rcvq->head);
- dev_err(dev, " rcvq->tail[%p]\n", rcvq->tail);
- dev_err(dev, " rcvq->count[%x]\n", rcvq->count);
+ dev_err(dev, " rcvq->head[%p]\n",
+ rcvq->head);
+ dev_err(dev, " rcvq->tail[%p]\n",
+ rcvq->tail);
+ dev_err(dev, " rcvq->count[%x]\n",
+ rcvq->count);
dev_err(dev, "SKIP THIS SKB!!!!!!!!\n");
goto retry_rcvqfill;
}
@@ -1549,14 +1555,18 @@ retry_rcvqfill:
dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
__func__);
dev_err(dev, "skb[%p] PROBLEM\n", skb);
- dev_err(dev, " skbdata[%p]\n", skb->data);
+ dev_err(dev, " skbdata[%p]\n",
+ skb->data);
dev_err(dev, " skblen[%x]\n", skb->len);
dev_err(dev, " paddr[%p]\n", paddr);
dev_err(dev, " paddrl[%x]\n", paddrl);
dev_err(dev, " paddrh[%x]\n", paddrh);
- dev_err(dev, " rcvq->head[%p]\n", rcvq->head);
- dev_err(dev, " rcvq->tail[%p]\n", rcvq->tail);
- dev_err(dev, " rcvq->count[%x]\n", rcvq->count);
+ dev_err(dev, " rcvq->head[%p]\n",
+ rcvq->head);
+ dev_err(dev, " rcvq->tail[%p]\n",
+ rcvq->tail);
+ dev_err(dev, " rcvq->count[%x]\n",
+ rcvq->count);
dev_err(dev, "GIVE TO CARD ANYWAY\n");
}
#endif
@@ -1885,7 +1895,8 @@ static void slic_xmit_fail(struct adapter *adapter,
break;
case XMIT_FAIL_HOSTCMD_FAIL:
dev_err(&adapter->netdev->dev,
- "xmit_start skb[%p] type[%x] No host commands available\n", skb, skb->pkt_type);
+ "xmit_start skb[%p] type[%x] No host commands available\n",
+ skb, skb->pkt_type);
break;
}
}
@@ -2097,7 +2108,8 @@ static void slic_interrupt_card_up(u32 isr, struct adapter *adapter,
}
} else if (isr & ISR_XDROP) {
dev_err(&dev->dev,
- "isr & ISR_ERR [%x] ISR_XDROP\n", isr);
+ "isr & ISR_ERR [%x] ISR_XDROP\n",
+ isr);
} else {
dev_err(&dev->dev,
"isr & ISR_ERR [%x]\n",
@@ -2341,7 +2353,8 @@ static int slic_if_init(struct adapter *adapter)
SLIC_GET_ADDR_LOW(&pshmem->isr), FLUSH);
#else
slic_reg32_write(&slic_regs->slic_addr_upper, 0, DONT_FLUSH);
- slic_reg32_write(&slic_regs->slic_isp, (u32)&pshmem->isr, FLUSH);
+ slic_reg32_write(&slic_regs->slic_isp, (u32)&pshmem->isr,
+ FLUSH);
#endif
spin_unlock_irqrestore(&adapter->bit64reglock.lock,
adapter->bit64reglock.flags);
--
2.1.3

2014-12-03 06:08:46

by Sudip Mukherjee

Subject: Re: [PATCH] Staging: slicoss: Fix long line issues in slicoss.c

On Tue, Dec 02, 2014 at 11:45:00PM +0000, Sean Cleator wrote:
>
> A patch to the slicoss.c file to fix some of the long line issues found by the
> checkpath.pl tool
> Signed-off-by: Sean Cleator <[email protected]>

do not use whitespace before Signed-off-by

thanks
sudip

>
> ---
> drivers/staging/slicoss/slicoss.c | 39 ++++++++++++++++++++++++++-------------
> 1 file changed, 26 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
> index 56ca3b6..4df4a7e 100644
> --- a/drivers/staging/slicoss/slicoss.c
> +++ b/drivers/staging/slicoss/slicoss.c
> @@ -498,12 +498,14 @@ static int slic_card_download(struct adapter *adapter)
> slic_reg32_write(&slic_regs->slic_wcs,
> baseaddress + codeaddr, FLUSH);
> /* Write out instruction to low addr */
> - slic_reg32_write(&slic_regs->slic_wcs, instruction, FLUSH);
> + slic_reg32_write(&slic_regs->slic_wcs,
> + instruction, FLUSH);
> instruction = *(u32 *)(fw->data + index);
> index += 4;
>
> /* Write out instruction to high addr */
> - slic_reg32_write(&slic_regs->slic_wcs, instruction, FLUSH);
> + slic_reg32_write(&slic_regs->slic_wcs,
> + instruction, FLUSH);
> instruction = *(u32 *)(fw->data + index);
> index += 4;
> }
> @@ -1533,14 +1535,18 @@ retry_rcvqfill:
> dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
> __func__);
> dev_err(dev, "skb[%p] PROBLEM\n", skb);
> - dev_err(dev, " skbdata[%p]\n", skb->data);
> + dev_err(dev, " skbdata[%p]\n",
> + skb->data);
> dev_err(dev, " skblen[%x]\n", skb->len);
> dev_err(dev, " paddr[%p]\n", paddr);
> dev_err(dev, " paddrl[%x]\n", paddrl);
> dev_err(dev, " paddrh[%x]\n", paddrh);
> - dev_err(dev, " rcvq->head[%p]\n", rcvq->head);
> - dev_err(dev, " rcvq->tail[%p]\n", rcvq->tail);
> - dev_err(dev, " rcvq->count[%x]\n", rcvq->count);
> + dev_err(dev, " rcvq->head[%p]\n",
> + rcvq->head);
> + dev_err(dev, " rcvq->tail[%p]\n",
> + rcvq->tail);
> + dev_err(dev, " rcvq->count[%x]\n",
> + rcvq->count);
> dev_err(dev, "SKIP THIS SKB!!!!!!!!\n");
> goto retry_rcvqfill;
> }
> @@ -1549,14 +1555,18 @@ retry_rcvqfill:
> dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
> __func__);
> dev_err(dev, "skb[%p] PROBLEM\n", skb);
> - dev_err(dev, " skbdata[%p]\n", skb->data);
> + dev_err(dev, " skbdata[%p]\n",
> + skb->data);
> dev_err(dev, " skblen[%x]\n", skb->len);
> dev_err(dev, " paddr[%p]\n", paddr);
> dev_err(dev, " paddrl[%x]\n", paddrl);
> dev_err(dev, " paddrh[%x]\n", paddrh);
> - dev_err(dev, " rcvq->head[%p]\n", rcvq->head);
> - dev_err(dev, " rcvq->tail[%p]\n", rcvq->tail);
> - dev_err(dev, " rcvq->count[%x]\n", rcvq->count);
> + dev_err(dev, " rcvq->head[%p]\n",
> + rcvq->head);
> + dev_err(dev, " rcvq->tail[%p]\n",
> + rcvq->tail);
> + dev_err(dev, " rcvq->count[%x]\n",
> + rcvq->count);
> dev_err(dev, "GIVE TO CARD ANYWAY\n");
> }
> #endif
> @@ -1885,7 +1895,8 @@ static void slic_xmit_fail(struct adapter *adapter,
> break;
> case XMIT_FAIL_HOSTCMD_FAIL:
> dev_err(&adapter->netdev->dev,
> - "xmit_start skb[%p] type[%x] No host commands available\n", skb, skb->pkt_type);
> + "xmit_start skb[%p] type[%x] No host commands available\n",
> + skb, skb->pkt_type);
> break;
> }
> }
> @@ -2097,7 +2108,8 @@ static void slic_interrupt_card_up(u32 isr, struct adapter *adapter,
> }
> } else if (isr & ISR_XDROP) {
> dev_err(&dev->dev,
> - "isr & ISR_ERR [%x] ISR_XDROP\n", isr);
> + "isr & ISR_ERR [%x] ISR_XDROP\n",
> + isr);
> } else {
> dev_err(&dev->dev,
> "isr & ISR_ERR [%x]\n",
> @@ -2341,7 +2353,8 @@ static int slic_if_init(struct adapter *adapter)
> SLIC_GET_ADDR_LOW(&pshmem->isr), FLUSH);
> #else
> slic_reg32_write(&slic_regs->slic_addr_upper, 0, DONT_FLUSH);
> - slic_reg32_write(&slic_regs->slic_isp, (u32)&pshmem->isr, FLUSH);
> + slic_reg32_write(&slic_regs->slic_isp, (u32)&pshmem->isr,
> + FLUSH);
> #endif
> spin_unlock_irqrestore(&adapter->bit64reglock.lock,
> adapter->bit64reglock.flags);
> --
> 2.1.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/