tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

staging: vt6655: Checkpatch fix: lines longer than 80 columns

This patch fixes lines longer than 80 columns in mac.c.
5 lines longer than 80 columns remain for the sake of readability.

Signed-off-by: Guillaume Brogi <gui-gui@netcourrier.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Guillaume Brogi and committed by
Greg Kroah-Hartman d4855fe1 d8496fb4

+30 -15
+30 -15
drivers/staging/vt6655/mac.c
··· 70 70 * Return Value: true if all test bits On; otherwise false 71 71 * 72 72 */ 73 - bool MACbIsRegBitsOn(void __iomem *dwIoBase, unsigned char byRegOfs, unsigned char byTestBits) 73 + bool MACbIsRegBitsOn(void __iomem *dwIoBase, unsigned char byRegOfs, 74 + unsigned char byTestBits) 74 75 { 75 76 unsigned char byData; 76 77 ··· 94 93 * Return Value: true if all test bits Off; otherwise false 95 94 * 96 95 */ 97 - bool MACbIsRegBitsOff(void __iomem *dwIoBase, unsigned char byRegOfs, unsigned char byTestBits) 96 + bool MACbIsRegBitsOff(void __iomem *dwIoBase, unsigned char byRegOfs, 97 + unsigned char byTestBits) 98 98 { 99 99 unsigned char byData; 100 100 ··· 220 218 221 219 /* read page1 register */ 222 220 for (ii = 0; ii < MAC_MAX_CONTEXT_SIZE_PAGE1; ii++) 223 - VNSvInPortB((dwIoBase + ii), (pbyCxtBuf + MAC_MAX_CONTEXT_SIZE_PAGE0 + ii)); 221 + VNSvInPortB((dwIoBase + ii), 222 + (pbyCxtBuf + MAC_MAX_CONTEXT_SIZE_PAGE0 + ii)); 224 223 225 224 MACvSelectPage0(dwIoBase); 226 225 } ··· 247 244 MACvSelectPage1(dwIoBase); 248 245 /* restore page1 */ 249 246 for (ii = 0; ii < MAC_MAX_CONTEXT_SIZE_PAGE1; ii++) 250 - VNSvOutPortB((dwIoBase + ii), *(pbyCxtBuf + MAC_MAX_CONTEXT_SIZE_PAGE0 + ii)); 247 + VNSvOutPortB((dwIoBase + ii), 248 + *(pbyCxtBuf + MAC_MAX_CONTEXT_SIZE_PAGE0 + ii)); 251 249 252 250 MACvSelectPage0(dwIoBase); 253 251 ··· 267 263 VNSvOutPortB(dwIoBase + ii, *(pbyCxtBuf + ii)); 268 264 269 265 /* restore CURR_RX_DESC_ADDR, CURR_TX_DESC_ADDR */ 270 - VNSvOutPortD(dwIoBase + MAC_REG_TXDMAPTR0, *(unsigned long *)(pbyCxtBuf + MAC_REG_TXDMAPTR0)); 271 - VNSvOutPortD(dwIoBase + MAC_REG_AC0DMAPTR, *(unsigned long *)(pbyCxtBuf + MAC_REG_AC0DMAPTR)); 272 - VNSvOutPortD(dwIoBase + MAC_REG_BCNDMAPTR, *(unsigned long *)(pbyCxtBuf + MAC_REG_BCNDMAPTR)); 266 + VNSvOutPortD(dwIoBase + MAC_REG_TXDMAPTR0, 267 + *(unsigned long *)(pbyCxtBuf + MAC_REG_TXDMAPTR0)); 268 + VNSvOutPortD(dwIoBase + MAC_REG_AC0DMAPTR, 269 + *(unsigned long *)(pbyCxtBuf + MAC_REG_AC0DMAPTR)); 270 + VNSvOutPortD(dwIoBase + MAC_REG_BCNDMAPTR, 271 + *(unsigned long *)(pbyCxtBuf + MAC_REG_BCNDMAPTR)); 273 272 274 - VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR0, *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR0)); 273 + VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR0, 274 + *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR0)); 275 275 276 - VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR1, *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR1)); 276 + VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR1, 277 + *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR1)); 277 278 } 278 279 279 280 /* ··· 650 641 * Return Value: none 651 642 * 652 643 */ 653 - void MACvSetCurrTx0DescAddrEx(void __iomem *dwIoBase, unsigned long dwCurrDescAddr) 644 + void MACvSetCurrTx0DescAddrEx(void __iomem *dwIoBase, 645 + unsigned long dwCurrDescAddr) 654 646 { 655 647 unsigned short ww; 656 648 unsigned char byData; ··· 689 679 * 690 680 */ 691 681 /* TxDMA1 = AC0DMA */ 692 - void MACvSetCurrAC0DescAddrEx(void __iomem *dwIoBase, unsigned long dwCurrDescAddr) 682 + void MACvSetCurrAC0DescAddrEx(void __iomem *dwIoBase, 683 + unsigned long dwCurrDescAddr) 693 684 { 694 685 unsigned short ww; 695 686 unsigned char byData; ··· 714 703 VNSvOutPortB(dwIoBase + MAC_REG_AC0DMACTL, DMACTL_RUN); 715 704 } 716 705 717 - void MACvSetCurrTXDescAddr(int iTxType, void __iomem *dwIoBase, unsigned long dwCurrDescAddr) 706 + void MACvSetCurrTXDescAddr(int iTxType, void __iomem *dwIoBase, 707 + unsigned long dwCurrDescAddr) 718 708 { 719 709 if (iTxType == TYPE_AC0DMA) 720 710 MACvSetCurrAC0DescAddrEx(dwIoBase, dwCurrDescAddr); ··· 779 767 VNSvOutPortB(dwIoBase + MAC_REG_TMCTL1, (TMCTL_TMD | TMCTL_TE)); 780 768 } 781 769 782 - void MACvSetMISCFifo(void __iomem *dwIoBase, unsigned short wOffset, unsigned long dwData) 770 + void MACvSetMISCFifo(void __iomem *dwIoBase, unsigned short wOffset, 771 + unsigned long dwData) 783 772 { 784 773 if (wOffset > 273) 785 774 return; ··· 829 816 * 830 817 */ 831 818 832 - void MACvSetKeyEntry(void __iomem *dwIoBase, unsigned short wKeyCtl, unsigned int uEntryIdx, 833 - unsigned int uKeyIdx, unsigned char *pbyAddr, u32 *pdwKey, unsigned char byLocalID) 819 + void MACvSetKeyEntry(void __iomem *dwIoBase, unsigned short wKeyCtl, 820 + unsigned int uEntryIdx, unsigned int uKeyIdx, 821 + unsigned char *pbyAddr, u32 *pdwKey, 822 + unsigned char byLocalID) 834 823 { 835 824 unsigned short wOffset; 836 825 u32 dwData;