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

Staging: rt2860: fixed coding-style issues in pci_main_dev.c

fixed a bunch of coding-style issues generated from checkpatch.pl

Signed-off-by: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Henrik Hautakoski and committed by
Greg Kroah-Hartman
347fd7db 8d1fe5ea

+20 -17
+20 -17
drivers/staging/rt2860/pci_main_dev.c
··· 107 107 /* Our PCI driver structure */ 108 108 /* */ 109 109 static struct pci_driver rt2860_driver = { 110 - name: "rt2860", 111 - id_table:rt2860_pci_tbl, 112 - probe: rt2860_probe, 113 - remove:__devexit_p(rt2860_remove_one), 110 + name: "rt2860", 111 + id_table : rt2860_pci_tbl, 112 + probe : rt2860_probe, 113 + remove : __devexit_p(rt2860_remove_one), 114 114 #ifdef CONFIG_PM 115 - suspend:rt2860_suspend, 116 - resume:rt2860_resume, 115 + suspend : rt2860_suspend, 116 + resume : rt2860_resume, 117 117 #endif 118 118 }; 119 119 ··· 211 211 212 212 DBGPRINT(RT_DEBUG_TRACE, ("===> rt2860_resume()\n")); 213 213 214 - if (net_dev == NULL) { 214 + if (net_dev == NULL) 215 215 DBGPRINT(RT_DEBUG_ERROR, ("net_dev == NULL!\n")); 216 - } else 216 + else 217 217 GET_PAD_FROM_NET_DEV(pAd, net_dev); 218 218 219 219 if (pAd != NULL) { ··· 281 281 282 282 /*PCIDevInit============================================== */ 283 283 /* wake up and enable device */ 284 - if ((rv = pci_enable_device(pci_dev)) != 0) { 284 + rv = pci_enable_device(pci_dev); 285 + 286 + if (rv != 0) { 285 287 DBGPRINT(RT_DEBUG_ERROR, 286 288 ("Enable PCI device failed, errno=%d!\n", rv)); 287 289 return rv; ··· 291 289 292 290 print_name = (char *)pci_name(pci_dev); 293 291 294 - if ((rv = pci_request_regions(pci_dev, print_name)) != 0) { 292 + rv = pci_request_regions(pci_dev, print_name); 293 + 294 + if (rv != 0) { 295 295 DBGPRINT(RT_DEBUG_ERROR, 296 296 ("Request PCI resource failed, errno=%d!\n", rv)); 297 297 goto err_out; ··· 494 490 495 491 /* Support advanced power save after 2892/2790. */ 496 492 /* MAC version at offset 0x1000 is 0x2872XXXX/0x2870XXXX(PCIe, USB, SDIO). */ 497 - if ((MacCsr0 & 0xffff0000) != 0x28600000) { 493 + if ((MacCsr0 & 0xffff0000) != 0x28600000) 498 494 OPSTATUS_SET_FLAG(pAd, fOP_STATUS_PCIE_DEVICE); 499 - } 500 495 } 501 496 } 502 497 ··· 903 900 if ((Configuration != 0) && (Configuration != 0xFFFF)) { 904 901 Configuration &= 0xfefc; 905 902 /* If call from interface down, restore to orginial setting. */ 906 - if (Level == RESTORE_CLOSE) { 903 + if (Level == RESTORE_CLOSE) 907 904 Configuration |= pAd->HostLnkCtrlConfiguration; 908 - } else 905 + else 909 906 Configuration |= 0x0; 910 907 PCI_REG_WIRTE_WORD(pObj->parent_pci_dev, 911 908 pAd->HostLnkCtrlOffset, ··· 1103 1100 /* Find PCI-to-PCI Bridge Express Capability Offset */ 1104 1101 pos = pci_find_capability(pObj->parent_pci_dev, PCI_CAP_ID_EXP); 1105 1102 1106 - if (pos != 0) { 1103 + if (pos != 0) 1107 1104 pAd->HostLnkCtrlOffset = pos + PCI_EXP_LNKCTL; 1108 - } 1105 + 1109 1106 /* If configurared to turn on L1. */ 1110 1107 HostConfiguration = 0; 1111 1108 if (pAd->StaCfg.PSControl.field.rt30xxForceASPMTest == 1) { 1112 - DBGPRINT(RT_DEBUG_TRACE, ("Enter,PSM : Force ASPM \n")); 1109 + DBGPRINT(RT_DEBUG_TRACE, ("Enter,PSM : Force ASPM\n")); 1113 1110 1114 1111 /* Skip non-exist deice right away */ 1115 1112 if ((pAd->HostLnkCtrlOffset != 0)) {