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

drivers/net: return operator cleanup

Change "return (EXPR);" to "return EXPR;"

return is not a function, parentheses are not required.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Eric Dumazet and committed by
David S. Miller
807540ba cb4dfe56

+762 -764
+1 -1
drivers/net/3c523.c
··· 463 463 464 464 /* we didn't find any 3c523 in the slots we checked for */ 465 465 if (slot == MCA_NOTFOUND) 466 - return ((base_addr || irq) ? -ENXIO : -ENODEV); 466 + return (base_addr || irq) ? -ENXIO : -ENODEV; 467 467 468 468 mca_set_adapter_name(slot, "3Com 3c523 Etherlink/MC"); 469 469 mca_set_adapter_procfn(slot, (MCA_ProcFn) elmc_getinfo, dev);
+5 -5
drivers/net/appletalk/ipddp.c
··· 244 244 } 245 245 246 246 spin_unlock_bh(&ipddp_route_lock); 247 - return (-ENOENT); 247 + return -ENOENT; 248 248 } 249 249 250 250 /* ··· 259 259 if(f->ip == rt->ip && 260 260 f->at.s_net == rt->at.s_net && 261 261 f->at.s_node == rt->at.s_node) 262 - return (f); 262 + return f; 263 263 } 264 264 265 - return (NULL); 265 + return NULL; 266 266 } 267 267 268 268 static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ··· 279 279 switch(cmd) 280 280 { 281 281 case SIOCADDIPDDPRT: 282 - return (ipddp_create(&rcp)); 282 + return ipddp_create(&rcp); 283 283 284 284 case SIOCFINDIPDDPRT: 285 285 spin_lock_bh(&ipddp_route_lock); ··· 297 297 return -ENOENT; 298 298 299 299 case SIOCDELIPDDPRT: 300 - return (ipddp_delete(&rcp)); 300 + return ipddp_delete(&rcp); 301 301 302 302 default: 303 303 return -EINVAL;
+1 -1
drivers/net/appletalk/ltpc.c
··· 727 727 728 728 if (ltc->command != LT_RCVLAP) { 729 729 printk("unknown command 0x%02x from ltpc card\n",ltc->command); 730 - return(-1); 730 + return -1; 731 731 } 732 732 dnode = ltc->dnode; 733 733 snode = ltc->snode;
+12 -12
drivers/net/atarilance.c
··· 362 362 *cto++ = *cfrom++; 363 363 MFPDELAY(); 364 364 } 365 - return( dst ); 365 + return dst; 366 366 } 367 367 368 368 ··· 449 449 vbr[2] = save_berr; 450 450 local_irq_restore(flags); 451 451 452 - return( ret ); 452 + return ret; 453 453 } 454 454 455 455 static const struct net_device_ops lance_netdev_ops = { ··· 526 526 goto probe_ok; 527 527 528 528 probe_fail: 529 - return( 0 ); 529 + return 0; 530 530 531 531 probe_ok: 532 532 lp = netdev_priv(dev); ··· 556 556 if (request_irq(IRQ_AUTO_5, lance_interrupt, IRQ_TYPE_PRIO, 557 557 "PAM/Riebl-ST Ethernet", dev)) { 558 558 printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 ); 559 - return( 0 ); 559 + return 0; 560 560 } 561 561 dev->irq = (unsigned short)IRQ_AUTO_5; 562 562 } ··· 568 568 unsigned long irq = atari_register_vme_int(); 569 569 if (!irq) { 570 570 printk( "Lance: request for VME interrupt failed\n" ); 571 - return( 0 ); 571 + return 0; 572 572 } 573 573 if (request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO, 574 574 "Riebl-VME Ethernet", dev)) { 575 575 printk( "Lance: request for irq %ld failed\n", irq ); 576 - return( 0 ); 576 + return 0; 577 577 } 578 578 dev->irq = irq; 579 579 } ··· 637 637 /* XXX MSch */ 638 638 dev->watchdog_timeo = TX_TIMEOUT; 639 639 640 - return( 1 ); 640 + return 1; 641 641 } 642 642 643 643 ··· 666 666 DPRINTK( 2, ( "lance_open(): opening %s failed, i=%d, csr0=%04x\n", 667 667 dev->name, i, DREG )); 668 668 DREG = CSR0_STOP; 669 - return( -EIO ); 669 + return -EIO; 670 670 } 671 671 DREG = CSR0_IDON; 672 672 DREG = CSR0_STRT; ··· 676 676 677 677 DPRINTK( 2, ( "%s: LANCE is open, csr0 %04x\n", dev->name, DREG )); 678 678 679 - return( 0 ); 679 + return 0; 680 680 } 681 681 682 682 ··· 1126 1126 int i; 1127 1127 1128 1128 if (lp->cardtype != OLD_RIEBL && lp->cardtype != NEW_RIEBL) 1129 - return( -EOPNOTSUPP ); 1129 + return -EOPNOTSUPP; 1130 1130 1131 1131 if (netif_running(dev)) { 1132 1132 /* Only possible while card isn't started */ 1133 1133 DPRINTK( 1, ( "%s: hwaddr can be set only while card isn't open.\n", 1134 1134 dev->name )); 1135 - return( -EIO ); 1135 + return -EIO; 1136 1136 } 1137 1137 1138 1138 memcpy( dev->dev_addr, saddr->sa_data, dev->addr_len ); ··· 1142 1142 /* set also the magic for future sessions */ 1143 1143 *RIEBL_MAGIC_ADDR = RIEBL_MAGIC; 1144 1144 1145 - return( 0 ); 1145 + return 0; 1146 1146 } 1147 1147 1148 1148
+2 -2
drivers/net/atlx/atl1.c
··· 2094 2094 { 2095 2095 u16 next_to_clean = atomic_read(&tpd_ring->next_to_clean); 2096 2096 u16 next_to_use = atomic_read(&tpd_ring->next_to_use); 2097 - return ((next_to_clean > next_to_use) ? 2097 + return (next_to_clean > next_to_use) ? 2098 2098 next_to_clean - next_to_use - 1 : 2099 - tpd_ring->count + next_to_clean - next_to_use - 1); 2099 + tpd_ring->count + next_to_clean - next_to_use - 1; 2100 2100 } 2101 2101 2102 2102 static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb,
+2 -2
drivers/net/benet/be_cmds.c
··· 98 98 99 99 static inline bool is_link_state_evt(u32 trailer) 100 100 { 101 - return (((trailer >> ASYNC_TRAILER_EVENT_CODE_SHIFT) & 101 + return ((trailer >> ASYNC_TRAILER_EVENT_CODE_SHIFT) & 102 102 ASYNC_TRAILER_EVENT_CODE_MASK) == 103 - ASYNC_EVENT_CODE_LINK_STATE); 103 + ASYNC_EVENT_CODE_LINK_STATE; 104 104 } 105 105 106 106 static struct be_mcc_compl *be_mcc_compl_get(struct be_adapter *adapter)
+1 -1
drivers/net/bmac.c
··· 1581 1581 int i; 1582 1582 1583 1583 if (bmac_devs == NULL) 1584 - return (-ENOSYS); 1584 + return -ENOSYS; 1585 1585 1586 1586 len += sprintf(buffer, "BMAC counters & registers\n"); 1587 1587
+3 -3
drivers/net/bna/bna_ctrl.c
··· 25 25 static int 26 26 bna_is_aen(u8 msg_id) 27 27 { 28 - return (msg_id == BFI_LL_I2H_LINK_DOWN_AEN || 29 - msg_id == BFI_LL_I2H_LINK_UP_AEN); 28 + return msg_id == BFI_LL_I2H_LINK_DOWN_AEN || 29 + msg_id == BFI_LL_I2H_LINK_UP_AEN; 30 30 } 31 31 32 32 static void ··· 1702 1702 int 1703 1703 bna_device_status_get(struct bna_device *device) 1704 1704 { 1705 - return (device->fsm == (bfa_fsm_t)bna_device_sm_ready); 1705 + return device->fsm == (bfa_fsm_t)bna_device_sm_ready; 1706 1706 } 1707 1707 1708 1708 void
+10 -10
drivers/net/bnx2.c
··· 266 266 if (diff == TX_DESC_CNT) 267 267 diff = MAX_TX_DESC_CNT; 268 268 } 269 - return (bp->tx_ring_size - diff); 269 + return bp->tx_ring_size - diff; 270 270 } 271 271 272 272 static u32 ··· 299 299 static u32 300 300 bnx2_shmem_rd(struct bnx2 *bp, u32 offset) 301 301 { 302 - return (bnx2_reg_rd_ind(bp, bp->shmem_base + offset)); 302 + return bnx2_reg_rd_ind(bp, bp->shmem_base + offset); 303 303 } 304 304 305 305 static void ··· 977 977 static char * 978 978 bnx2_xceiver_str(struct bnx2 *bp) 979 979 { 980 - return ((bp->phy_port == PORT_FIBRE) ? "SerDes" : 980 + return (bp->phy_port == PORT_FIBRE) ? "SerDes" : 981 981 ((bp->phy_flags & BNX2_PHY_FLAG_SERDES) ? "Remote Copper" : 982 - "Copper")); 982 + "Copper"); 983 983 } 984 984 985 985 static void ··· 1758 1758 u32 new_adv = 0; 1759 1759 1760 1760 if (bp->phy_flags & BNX2_PHY_FLAG_REMOTE_PHY_CAP) 1761 - return (bnx2_setup_remote_phy(bp, port)); 1761 + return bnx2_setup_remote_phy(bp, port); 1762 1762 1763 1763 if (!(bp->autoneg & AUTONEG_SPEED)) { 1764 1764 u32 new_bmcr; ··· 2171 2171 return 0; 2172 2172 2173 2173 if (bp->phy_flags & BNX2_PHY_FLAG_SERDES) { 2174 - return (bnx2_setup_serdes_phy(bp, port)); 2174 + return bnx2_setup_serdes_phy(bp, port); 2175 2175 } 2176 2176 else { 2177 - return (bnx2_setup_copper_phy(bp)); 2177 + return bnx2_setup_copper_phy(bp); 2178 2178 } 2179 2179 } 2180 2180 ··· 7582 7582 struct bnx2 *bp = netdev_priv(dev); 7583 7583 7584 7584 if (CHIP_NUM(bp) == CHIP_NUM_5709) 7585 - return (ethtool_op_set_tx_ipv6_csum(dev, data)); 7585 + return ethtool_op_set_tx_ipv6_csum(dev, data); 7586 7586 else 7587 - return (ethtool_op_set_tx_csum(dev, data)); 7587 + return ethtool_op_set_tx_csum(dev, data); 7588 7588 } 7589 7589 7590 7590 static int ··· 7705 7705 return -EINVAL; 7706 7706 7707 7707 dev->mtu = new_mtu; 7708 - return (bnx2_change_ring_size(bp, bp->rx_ring_size, bp->tx_ring_size)); 7708 + return bnx2_change_ring_size(bp, bp->rx_ring_size, bp->tx_ring_size); 7709 7709 } 7710 7710 7711 7711 #ifdef CONFIG_NET_POLL_CONTROLLER
+2 -2
drivers/net/bnx2x/bnx2x_cmn.h
··· 399 399 { 400 400 /* Tell compiler that consumer and producer can change */ 401 401 barrier(); 402 - return (fp->tx_pkt_prod != fp->tx_pkt_cons); 402 + return fp->tx_pkt_prod != fp->tx_pkt_cons; 403 403 } 404 404 405 405 static inline u16 bnx2x_tx_avail(struct bnx2x_fastpath *fp) ··· 632 632 rx_cons_sb = le16_to_cpu(*fp->rx_cons_sb); 633 633 if ((rx_cons_sb & MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT) 634 634 rx_cons_sb++; 635 - return (fp->rx_comp_cons != rx_cons_sb); 635 + return fp->rx_comp_cons != rx_cons_sb; 636 636 } 637 637 638 638 /* HW Lock for shared dual port PHYs */
+1 -1
drivers/net/bonding/bond_3ad.c
··· 252 252 */ 253 253 static inline int __port_is_enabled(struct port *port) 254 254 { 255 - return(port->slave->state == BOND_STATE_ACTIVE); 255 + return port->slave->state == BOND_STATE_ACTIVE; 256 256 } 257 257 258 258 /**
+1 -1
drivers/net/bsd_comp.c
··· 429 429 if (!db->lens) 430 430 { 431 431 bsd_free (db); 432 - return (NULL); 432 + return NULL; 433 433 } 434 434 } 435 435 /*
+2 -2
drivers/net/cassini.c
··· 419 419 udelay(10); 420 420 cmd = readl(cp->regs + REG_MIF_FRAME); 421 421 if (cmd & MIF_FRAME_TURN_AROUND_LSB) 422 - return (cmd & MIF_FRAME_DATA_MASK); 422 + return cmd & MIF_FRAME_DATA_MASK; 423 423 } 424 424 return 0xFFFF; /* -1 */ 425 425 } ··· 804 804 break; 805 805 udelay(10); 806 806 } 807 - return (limit <= 0); 807 + return limit <= 0; 808 808 } 809 809 810 810 static int cas_saturn_firmware_init(struct cas *cp)
+1 -1
drivers/net/chelsio/sge.c
··· 1551 1551 const struct respQ *Q = &adapter->sge->respQ; 1552 1552 const struct respQ_e *e = &Q->entries[Q->cidx]; 1553 1553 1554 - return (e->GenerationBit == Q->genbit); 1554 + return e->GenerationBit == Q->genbit; 1555 1555 } 1556 1556 1557 1557 /*
+1 -1
drivers/net/chelsio/vsc7326.c
··· 255 255 else if ((result & (1 << 8)) != 0x0) 256 256 pr_err("bist read error: 0x%x\n", result); 257 257 258 - return (result & 0xff); 258 + return result & 0xff; 259 259 } 260 260 261 261 static int bist_wr(adapter_t *adapter, int moduleid, int address, int value)
+1 -1
drivers/net/cxgb3/cxgb3_offload.c
··· 64 64 { 65 65 const struct adapter *adapter = tdev2adap(tdev); 66 66 67 - return (test_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map)); 67 + return test_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map); 68 68 } 69 69 70 70 /**
+1 -1
drivers/net/de620.c
··· 676 676 de620_set_register(dev, W_NPRF, next_rx_page); 677 677 pr_debug("next_rx_page=%d CPR=%d\n", next_rx_page, curr_page); 678 678 679 - return (next_rx_page != curr_page); /* That was slightly tricky... */ 679 + return next_rx_page != curr_page; /* That was slightly tricky... */ 680 680 } 681 681 682 682 /*********************************************
+33 -33
drivers/net/defxx.c
··· 1024 1024 &data) != DFX_K_SUCCESS) { 1025 1025 printk("%s: Could not read adapter factory MAC address!\n", 1026 1026 print_name); 1027 - return(DFX_K_FAILURE); 1027 + return DFX_K_FAILURE; 1028 1028 } 1029 1029 le32 = cpu_to_le32(data); 1030 1030 memcpy(&bp->factory_mac_addr[0], &le32, sizeof(u32)); ··· 1033 1033 &data) != DFX_K_SUCCESS) { 1034 1034 printk("%s: Could not read adapter factory MAC address!\n", 1035 1035 print_name); 1036 - return(DFX_K_FAILURE); 1036 + return DFX_K_FAILURE; 1037 1037 } 1038 1038 le32 = cpu_to_le32(data); 1039 1039 memcpy(&bp->factory_mac_addr[4], &le32, sizeof(u16)); ··· 1075 1075 if (top_v == NULL) { 1076 1076 printk("%s: Could not allocate memory for host buffers " 1077 1077 "and structures!\n", print_name); 1078 - return(DFX_K_FAILURE); 1078 + return DFX_K_FAILURE; 1079 1079 } 1080 1080 memset(top_v, 0, alloc_size); /* zero out memory before continuing */ 1081 1081 top_p = bp->kmalloced_dma; /* get physical address of buffer */ ··· 1145 1145 DBG_printk("%s: Consumer block virt = %0lX, phys = %0X\n", 1146 1146 print_name, (long)bp->cons_block_virt, bp->cons_block_phys); 1147 1147 1148 - return(DFX_K_SUCCESS); 1148 + return DFX_K_SUCCESS; 1149 1149 } 1150 1150 1151 1151 ··· 1195 1195 if (dfx_hw_dma_uninit(bp, bp->reset_type) != DFX_K_SUCCESS) 1196 1196 { 1197 1197 printk("%s: Could not uninitialize/reset adapter!\n", bp->dev->name); 1198 - return(DFX_K_FAILURE); 1198 + return DFX_K_FAILURE; 1199 1199 } 1200 1200 1201 1201 /* ··· 1229 1229 NULL) != DFX_K_SUCCESS) 1230 1230 { 1231 1231 printk("%s: Could not set adapter burst size!\n", bp->dev->name); 1232 - return(DFX_K_FAILURE); 1232 + return DFX_K_FAILURE; 1233 1233 } 1234 1234 1235 1235 /* ··· 1246 1246 NULL) != DFX_K_SUCCESS) 1247 1247 { 1248 1248 printk("%s: Could not set consumer block address!\n", bp->dev->name); 1249 - return(DFX_K_FAILURE); 1249 + return DFX_K_FAILURE; 1250 1250 } 1251 1251 1252 1252 /* ··· 1278 1278 if (dfx_hw_dma_cmd_req(bp) != DFX_K_SUCCESS) 1279 1279 { 1280 1280 printk("%s: DMA command request failed!\n", bp->dev->name); 1281 - return(DFX_K_FAILURE); 1281 + return DFX_K_FAILURE; 1282 1282 } 1283 1283 1284 1284 /* Set the initial values for eFDXEnable and MACTReq MIB objects */ ··· 1294 1294 if (dfx_hw_dma_cmd_req(bp) != DFX_K_SUCCESS) 1295 1295 { 1296 1296 printk("%s: DMA command request failed!\n", bp->dev->name); 1297 - return(DFX_K_FAILURE); 1297 + return DFX_K_FAILURE; 1298 1298 } 1299 1299 1300 1300 /* Initialize adapter CAM */ ··· 1302 1302 if (dfx_ctl_update_cam(bp) != DFX_K_SUCCESS) 1303 1303 { 1304 1304 printk("%s: Adapter CAM update failed!\n", bp->dev->name); 1305 - return(DFX_K_FAILURE); 1305 + return DFX_K_FAILURE; 1306 1306 } 1307 1307 1308 1308 /* Initialize adapter filters */ ··· 1310 1310 if (dfx_ctl_update_filters(bp) != DFX_K_SUCCESS) 1311 1311 { 1312 1312 printk("%s: Adapter filters update failed!\n", bp->dev->name); 1313 - return(DFX_K_FAILURE); 1313 + return DFX_K_FAILURE; 1314 1314 } 1315 1315 1316 1316 /* ··· 1328 1328 printk("%s: Receive buffer allocation failed\n", bp->dev->name); 1329 1329 if (get_buffers) 1330 1330 dfx_rcv_flush(bp); 1331 - return(DFX_K_FAILURE); 1331 + return DFX_K_FAILURE; 1332 1332 } 1333 1333 1334 1334 /* Issue START command and bring adapter to LINK_(UN)AVAILABLE state */ ··· 1339 1339 printk("%s: Start command failed\n", bp->dev->name); 1340 1340 if (get_buffers) 1341 1341 dfx_rcv_flush(bp); 1342 - return(DFX_K_FAILURE); 1342 + return DFX_K_FAILURE; 1343 1343 } 1344 1344 1345 1345 /* Initialization succeeded, reenable PDQ interrupts */ 1346 1346 1347 1347 dfx_port_write_long(bp, PI_PDQ_K_REG_HOST_INT_ENB, PI_HOST_INT_K_ENABLE_DEF_INTS); 1348 - return(DFX_K_SUCCESS); 1348 + return DFX_K_SUCCESS; 1349 1349 } 1350 1350 1351 1351 ··· 1434 1434 1435 1435 /* Set device structure info */ 1436 1436 netif_start_queue(dev); 1437 - return(0); 1437 + return 0; 1438 1438 } 1439 1439 1440 1440 ··· 1526 1526 1527 1527 free_irq(dev->irq, dev); 1528 1528 1529 - return(0); 1529 + return 0; 1530 1530 } 1531 1531 1532 1532 ··· 2027 2027 2028 2028 bp->cmd_req_virt->cmd_type = PI_CMD_K_SMT_MIB_GET; 2029 2029 if (dfx_hw_dma_cmd_req(bp) != DFX_K_SUCCESS) 2030 - return((struct net_device_stats *) &bp->stats); 2030 + return (struct net_device_stats *)&bp->stats; 2031 2031 2032 2032 /* Fill the bp->stats structure with the SMT MIB object values */ 2033 2033 ··· 2128 2128 2129 2129 bp->cmd_req_virt->cmd_type = PI_CMD_K_CNTRS_GET; 2130 2130 if (dfx_hw_dma_cmd_req(bp) != DFX_K_SUCCESS) 2131 - return((struct net_device_stats *) &bp->stats); 2131 + return (struct net_device_stats *)&bp->stats; 2132 2132 2133 2133 /* Fill the bp->stats structure with the FDDI counter values */ 2134 2134 ··· 2144 2144 bp->stats.port_lem_cts[0] = bp->cmd_rsp_virt->cntrs_get.cntrs.link_errors[0].ls; 2145 2145 bp->stats.port_lem_cts[1] = bp->cmd_rsp_virt->cntrs_get.cntrs.link_errors[1].ls; 2146 2146 2147 - return((struct net_device_stats *) &bp->stats); 2147 + return (struct net_device_stats *)&bp->stats; 2148 2148 } 2149 2149 2150 2150 ··· 2354 2354 { 2355 2355 DBG_printk("%s: Adapter CAM updated with new MAC address\n", dev->name); 2356 2356 } 2357 - return(0); /* always return zero */ 2357 + return 0; /* always return zero */ 2358 2358 } 2359 2359 2360 2360 ··· 2438 2438 /* Issue command to update adapter CAM, then return */ 2439 2439 2440 2440 if (dfx_hw_dma_cmd_req(bp) != DFX_K_SUCCESS) 2441 - return(DFX_K_FAILURE); 2442 - return(DFX_K_SUCCESS); 2441 + return DFX_K_FAILURE; 2442 + return DFX_K_SUCCESS; 2443 2443 } 2444 2444 2445 2445 ··· 2504 2504 /* Issue command to update adapter filters, then return */ 2505 2505 2506 2506 if (dfx_hw_dma_cmd_req(bp) != DFX_K_SUCCESS) 2507 - return(DFX_K_FAILURE); 2508 - return(DFX_K_SUCCESS); 2507 + return DFX_K_FAILURE; 2508 + return DFX_K_SUCCESS; 2509 2509 } 2510 2510 2511 2511 ··· 2561 2561 (status == PI_STATE_K_HALTED) || 2562 2562 (status == PI_STATE_K_DMA_UNAVAIL) || 2563 2563 (status == PI_STATE_K_UPGRADE)) 2564 - return(DFX_K_OUTSTATE); 2564 + return DFX_K_OUTSTATE; 2565 2565 2566 2566 /* Put response buffer on the command response queue */ 2567 2567 ··· 2599 2599 udelay(100); /* wait for 100 microseconds */ 2600 2600 } 2601 2601 if (timeout_cnt == 0) 2602 - return(DFX_K_HW_TIMEOUT); 2602 + return DFX_K_HW_TIMEOUT; 2603 2603 2604 2604 /* Bump (and wrap) the completion index and write out to register */ 2605 2605 ··· 2619 2619 udelay(100); /* wait for 100 microseconds */ 2620 2620 } 2621 2621 if (timeout_cnt == 0) 2622 - return(DFX_K_HW_TIMEOUT); 2622 + return DFX_K_HW_TIMEOUT; 2623 2623 2624 2624 /* Bump (and wrap) the completion index and write out to register */ 2625 2625 2626 2626 bp->cmd_rsp_reg.index.comp += 1; 2627 2627 bp->cmd_rsp_reg.index.comp &= PI_CMD_RSP_K_NUM_ENTRIES-1; 2628 2628 dfx_port_write_long(bp, PI_PDQ_K_REG_CMD_RSP_PROD, bp->cmd_rsp_reg.lword); 2629 - return(DFX_K_SUCCESS); 2629 + return DFX_K_SUCCESS; 2630 2630 } 2631 2631 2632 2632 ··· 2700 2700 udelay(100); /* wait for 100 microseconds */ 2701 2701 } 2702 2702 if (timeout_cnt == 0) 2703 - return(DFX_K_HW_TIMEOUT); 2703 + return DFX_K_HW_TIMEOUT; 2704 2704 2705 2705 /* 2706 2706 * If the address of host_data is non-zero, assume caller has supplied a ··· 2710 2710 2711 2711 if (host_data != NULL) 2712 2712 dfx_port_read_long(bp, PI_PDQ_K_REG_HOST_DATA, host_data); 2713 - return(DFX_K_SUCCESS); 2713 + return DFX_K_SUCCESS; 2714 2714 } 2715 2715 2716 2716 ··· 2800 2800 PI_UINT32 port_status; /* Port Status register value */ 2801 2801 2802 2802 dfx_port_read_long(bp, PI_PDQ_K_REG_PORT_STATUS, &port_status); 2803 - return((port_status & PI_PSTATUS_M_STATE) >> PI_PSTATUS_V_STATE); 2803 + return (port_status & PI_PSTATUS_M_STATE) >> PI_PSTATUS_V_STATE; 2804 2804 } 2805 2805 2806 2806 ··· 2852 2852 udelay(100); /* wait for 100 microseconds */ 2853 2853 } 2854 2854 if (timeout_cnt == 0) 2855 - return(DFX_K_HW_TIMEOUT); 2856 - return(DFX_K_SUCCESS); 2855 + return DFX_K_HW_TIMEOUT; 2856 + return DFX_K_SUCCESS; 2857 2857 } 2858 2858 2859 2859 /*
+2 -2
drivers/net/e100.c
··· 2215 2215 static int e100_asf(struct nic *nic) 2216 2216 { 2217 2217 /* ASF can be enabled from eeprom */ 2218 - return((nic->pdev->device >= 0x1050) && (nic->pdev->device <= 0x1057) && 2218 + return (nic->pdev->device >= 0x1050) && (nic->pdev->device <= 0x1057) && 2219 2219 (nic->eeprom[eeprom_config_asf] & eeprom_asf) && 2220 2220 !(nic->eeprom[eeprom_config_asf] & eeprom_gcl) && 2221 - ((nic->eeprom[eeprom_smbus_addr] & 0xFF) != 0xFE)); 2221 + ((nic->eeprom[eeprom_smbus_addr] & 0xFF) != 0xFE); 2222 2222 } 2223 2223 2224 2224 static int e100_up(struct nic *nic)
+1 -1
drivers/net/e1000/e1000_main.c
··· 3600 3600 adapter->total_tx_packets += total_tx_packets; 3601 3601 netdev->stats.tx_bytes += total_tx_bytes; 3602 3602 netdev->stats.tx_packets += total_tx_packets; 3603 - return (count < tx_ring->count); 3603 + return count < tx_ring->count; 3604 3604 } 3605 3605 3606 3606 /**
+2 -2
drivers/net/e1000e/ethtool.c
··· 368 368 static u32 e1000_get_rx_csum(struct net_device *netdev) 369 369 { 370 370 struct e1000_adapter *adapter = netdev_priv(netdev); 371 - return (adapter->flags & FLAG_RX_CSUM_ENABLED); 371 + return adapter->flags & FLAG_RX_CSUM_ENABLED; 372 372 } 373 373 374 374 static int e1000_set_rx_csum(struct net_device *netdev, u32 data) ··· 389 389 390 390 static u32 e1000_get_tx_csum(struct net_device *netdev) 391 391 { 392 - return ((netdev->features & NETIF_F_HW_CSUM) != 0); 392 + return (netdev->features & NETIF_F_HW_CSUM) != 0; 393 393 } 394 394 395 395 static int e1000_set_tx_csum(struct net_device *netdev, u32 data)
+1 -1
drivers/net/e1000e/netdev.c
··· 1053 1053 adapter->total_tx_packets += total_tx_packets; 1054 1054 netdev->stats.tx_bytes += total_tx_bytes; 1055 1055 netdev->stats.tx_packets += total_tx_packets; 1056 - return (count < tx_ring->count); 1056 + return count < tx_ring->count; 1057 1057 } 1058 1058 1059 1059 /**
+1 -1
drivers/net/enic/vnic_rq.h
··· 143 143 144 144 static inline int vnic_rq_posting_soon(struct vnic_rq *rq) 145 145 { 146 - return ((rq->to_use->index & VNIC_RQ_RETURN_RATE) == 0); 146 + return (rq->to_use->index & VNIC_RQ_RETURN_RATE) == 0; 147 147 } 148 148 149 149 static inline void vnic_rq_return_descs(struct vnic_rq *rq, unsigned int count)
+6 -6
drivers/net/eth16i.c
··· 796 796 797 797 if(eth16i_debug > 1) 798 798 printk(KERN_DEBUG "RECEIVE_PACKET\n"); 799 - return(0); /* Found receive packet */ 799 + return 0; /* Found receive packet */ 800 800 } 801 801 } 802 802 ··· 805 805 printk(KERN_DEBUG "RX_STATUS_REG = %x\n", inb(ioaddr + RX_STATUS_REG)); 806 806 } 807 807 808 - return(0); /* Return success */ 808 + return 0; /* Return success */ 809 809 } 810 810 811 811 #if 0 ··· 841 841 842 842 if( ioaddr < 0x1000) { 843 843 cbyte = inb(ioaddr + JUMPERLESS_CONFIG); 844 - return( eth16i_irqmap[ ((cbyte & 0xC0) >> 6) ] ); 844 + return eth16i_irqmap[((cbyte & 0xC0) >> 6)]; 845 845 } else { /* Oh..the card is EISA so method getting IRQ different */ 846 846 unsigned short index = 0; 847 847 cbyte = inb(ioaddr + EISA_IRQ_REG); ··· 849 849 cbyte = cbyte >> 1; 850 850 index++; 851 851 } 852 - return( eth32i_irqmap[ index ] ); 852 + return eth32i_irqmap[index]; 853 853 } 854 854 } 855 855 ··· 909 909 data = eth16i_read_eeprom_word(ioaddr); 910 910 outb(CS_0 | SK_0, ioaddr + EEPROM_CTRL_REG); 911 911 912 - return(data); 912 + return data; 913 913 } 914 914 915 915 static int eth16i_read_eeprom_word(int ioaddr) ··· 928 928 eeprom_slow_io(); 929 929 } 930 930 931 - return(data); 931 + return data; 932 932 } 933 933 934 934 static void eth16i_eeprom_cmd(int ioaddr, unsigned char command)
+1 -1
drivers/net/forcedeth.c
··· 4620 4620 static u32 nv_get_rx_csum(struct net_device *dev) 4621 4621 { 4622 4622 struct fe_priv *np = netdev_priv(dev); 4623 - return (np->rx_csum) != 0; 4623 + return np->rx_csum != 0; 4624 4624 } 4625 4625 4626 4626 static int nv_set_rx_csum(struct net_device *dev, u32 data)
+2 -2
drivers/net/fsl_pq_mdio.c
··· 125 125 struct fsl_pq_mdio __iomem *regs = fsl_pq_mdio_get_regs(bus); 126 126 127 127 /* Write to the local MII regs */ 128 - return(fsl_pq_local_mdio_write(regs, mii_id, regnum, value)); 128 + return fsl_pq_local_mdio_write(regs, mii_id, regnum, value); 129 129 } 130 130 131 131 /* ··· 137 137 struct fsl_pq_mdio __iomem *regs = fsl_pq_mdio_get_regs(bus); 138 138 139 139 /* Read the local MII regs */ 140 - return(fsl_pq_local_mdio_read(regs, mii_id, regnum)); 140 + return fsl_pq_local_mdio_read(regs, mii_id, regnum); 141 141 } 142 142 143 143 /* Reset the MIIM registers, and wait for the bus to free */
+2 -2
drivers/net/gianfar_ethtool.c
··· 254 254 255 255 /* Make sure we return a number greater than 0 256 256 * if usecs > 0 */ 257 - return ((usecs * 1000 + count - 1) / count); 257 + return (usecs * 1000 + count - 1) / count; 258 258 } 259 259 260 260 /* Convert ethernet clock ticks to microseconds */ ··· 278 278 279 279 /* Make sure we return a number greater than 0 */ 280 280 /* if ticks is > 0 */ 281 - return ((ticks * count) / 1000); 281 + return (ticks * count) / 1000; 282 282 } 283 283 284 284 /* Get the coalescing parameters, and put them in the cvals
+1 -1
drivers/net/hamradio/bpqether.c
··· 168 168 169 169 static inline int dev_is_ethdev(struct net_device *dev) 170 170 { 171 - return (dev->type == ARPHRD_ETHER && strncmp(dev->name, "dummy", 5)); 171 + return dev->type == ARPHRD_ETHER && strncmp(dev->name, "dummy", 5); 172 172 } 173 173 174 174 /* ------------------------------------------------------------------------ */
+1 -1
drivers/net/hamradio/hdlcdrv.c
··· 110 110 for (; cnt > 0; cnt--) 111 111 crc = (crc >> 8) ^ crc_ccitt_table[(crc ^ *buf++) & 0xff]; 112 112 crc ^= 0xffff; 113 - return (crc & 0xffff); 113 + return crc & 0xffff; 114 114 } 115 115 #endif 116 116
+3 -3
drivers/net/hp100.c
··· 1312 1312 for (p = (ringptr->pdl); p < (ringptr->pdl + 5); p++) 1313 1313 printk("hp100: %s: Adr 0x%.8x = 0x%.8x\n", dev->name, (u_int) p, (u_int) * p); 1314 1314 #endif 1315 - return (1); 1315 + return 1; 1316 1316 } 1317 1317 /* else: */ 1318 1318 /* alloc_skb failed (no memory) -> still can receive the header ··· 1325 1325 1326 1326 ringptr->pdl[0] = 0x00010000; /* PDH: Count=1 Fragment */ 1327 1327 1328 - return (0); 1328 + return 0; 1329 1329 } 1330 1330 1331 1331 /* ··· 2752 2752 hp100_outw(HP100_MISC_ERROR, IRQ_STATUS); 2753 2753 2754 2754 if (val & HP100_LINK_UP_ST) 2755 - return (0); /* login was ok */ 2755 + return 0; /* login was ok */ 2756 2756 else { 2757 2757 printk("hp100: %s: Training failed.\n", dev->name); 2758 2758 hp100_down_vg_link(dev);
+3 -3
drivers/net/ibm_newemac/core.c
··· 2095 2095 if (emac_has_feature(dev, EMAC_FTR_EMAC4)) { 2096 2096 hdr->version = EMAC4_ETHTOOL_REGS_VER; 2097 2097 memcpy_fromio(hdr + 1, dev->emacp, EMAC4_ETHTOOL_REGS_SIZE(dev)); 2098 - return ((void *)(hdr + 1) + EMAC4_ETHTOOL_REGS_SIZE(dev)); 2098 + return (void *)(hdr + 1) + EMAC4_ETHTOOL_REGS_SIZE(dev); 2099 2099 } else { 2100 2100 hdr->version = EMAC_ETHTOOL_REGS_VER; 2101 2101 memcpy_fromio(hdr + 1, dev->emacp, EMAC_ETHTOOL_REGS_SIZE(dev)); 2102 - return ((void *)(hdr + 1) + EMAC_ETHTOOL_REGS_SIZE(dev)); 2102 + return (void *)(hdr + 1) + EMAC_ETHTOOL_REGS_SIZE(dev); 2103 2103 } 2104 2104 } 2105 2105 ··· 2293 2293 if (deps[i].drvdata != NULL) 2294 2294 there++; 2295 2295 } 2296 - return (there == EMAC_DEP_COUNT); 2296 + return there == EMAC_DEP_COUNT; 2297 2297 } 2298 2298 2299 2299 static void emac_put_deps(struct emac_instance *dev)
+3 -3
drivers/net/ibm_newemac/core.h
··· 410 410 else 411 411 offset = offsetof(struct emac_regs, u0.emac4.iaht1); 412 412 413 - return ((u32 *)((ptrdiff_t)p + offset)); 413 + return (u32 *)((ptrdiff_t)p + offset); 414 414 } 415 415 416 416 static inline u32 *emac_gaht_base(struct emac_instance *dev) ··· 418 418 /* GAHT registers always come after an identical number of 419 419 * IAHT registers. 420 420 */ 421 - return (emac_xaht_base(dev) + EMAC_XAHT_REGS(dev)); 421 + return emac_xaht_base(dev) + EMAC_XAHT_REGS(dev); 422 422 } 423 423 424 424 static inline u32 *emac_iaht_base(struct emac_instance *dev) ··· 426 426 /* IAHT registers always come before an identical number of 427 427 * GAHT registers. 428 428 */ 429 - return (emac_xaht_base(dev)); 429 + return emac_xaht_base(dev); 430 430 } 431 431 432 432 /* Ethtool get_regs complex data.
+1 -1
drivers/net/igb/igb_main.c
··· 5435 5435 tx_ring->total_packets += total_packets; 5436 5436 tx_ring->tx_stats.bytes += total_bytes; 5437 5437 tx_ring->tx_stats.packets += total_packets; 5438 - return (count < tx_ring->count); 5438 + return count < tx_ring->count; 5439 5439 } 5440 5440 5441 5441 /**
+1 -1
drivers/net/igbvf/ethtool.c
··· 153 153 154 154 static u32 igbvf_get_tx_csum(struct net_device *netdev) 155 155 { 156 - return ((netdev->features & NETIF_F_IP_CSUM) != 0); 156 + return (netdev->features & NETIF_F_IP_CSUM) != 0; 157 157 } 158 158 159 159 static int igbvf_set_tx_csum(struct net_device *netdev, u32 data)
+1 -1
drivers/net/igbvf/netdev.c
··· 845 845 } 846 846 adapter->net_stats.tx_bytes += total_bytes; 847 847 adapter->net_stats.tx_packets += total_packets; 848 - return (count < tx_ring->count); 848 + return count < tx_ring->count; 849 849 } 850 850 851 851 static irqreturn_t igbvf_msix_other(int irq, void *data)
+2 -2
drivers/net/irda/donauboe.c
··· 217 217 for (i = 0; i < len; ++i) 218 218 fcs.value = irda_fcs (fcs.value, *(buf++)); 219 219 220 - return (fcs.value == GOOD_FCS); 220 + return fcs.value == GOOD_FCS; 221 221 } 222 222 223 223 /***********************************************************************/ ··· 759 759 if (fir) 760 760 { 761 761 memset (buf, 0, TT_LEN); 762 - return (TT_LEN); 762 + return TT_LEN; 763 763 } 764 764 765 765 fcs.value = INIT_FCS;
+1 -1
drivers/net/irda/irda-usb.c
··· 1514 1514 IRDA_DEBUG(0, "%s(), And our endpoints are : in=%02X, out=%02X (%d), int=%02X\n", 1515 1515 __func__, self->bulk_in_ep, self->bulk_out_ep, self->bulk_out_mtu, self->bulk_int_ep); 1516 1516 1517 - return((self->bulk_in_ep != 0) && (self->bulk_out_ep != 0)); 1517 + return (self->bulk_in_ep != 0) && (self->bulk_out_ep != 0); 1518 1518 } 1519 1519 1520 1520 #ifdef IU_DUMP_CLASS_DESC
+1 -1
drivers/net/irda/nsc-ircc.c
··· 1348 1348 outb(bank, iobase+BSR); 1349 1349 1350 1350 /* Make sure interrupt handlers keep the proper interrupt mask */ 1351 - return(ier); 1351 + return ier; 1352 1352 } 1353 1353 1354 1354 /*
+1 -1
drivers/net/irda/sir_dev.c
··· 336 336 if (!atomic_read(&dev->enable_rx)) 337 337 return 0; 338 338 339 - return (dev->rx_buff.state != OUTSIDE_FRAME); 339 + return dev->rx_buff.state != OUTSIDE_FRAME; 340 340 } 341 341 342 342 int sirdev_set_dongle(struct sir_dev *dev, IRDA_DONGLE type)
+1 -1
drivers/net/irda/smsc-ircc2.c
··· 2051 2051 */ 2052 2052 static int smsc_ircc_is_receiving(struct smsc_ircc_cb *self) 2053 2053 { 2054 - return (self->rx_buff.state != OUTSIDE_FRAME); 2054 + return self->rx_buff.state != OUTSIDE_FRAME; 2055 2055 } 2056 2056 2057 2057
+1 -1
drivers/net/irda/stir4200.c
··· 219 219 220 220 static inline int isfir(u32 speed) 221 221 { 222 - return (speed == 4000000); 222 + return speed == 4000000; 223 223 } 224 224 225 225 /*
+1 -1
drivers/net/irda/via-ircc.h
··· 238 238 239 239 static __u8 ReadReg(unsigned int BaseAddr, int iRegNum) 240 240 { 241 - return ((__u8) inb(BaseAddr + iRegNum)); 241 + return (__u8) inb(BaseAddr + iRegNum); 242 242 } 243 243 244 244 static void WriteReg(unsigned int BaseAddr, int iRegNum, unsigned char iVal)
+1 -1
drivers/net/irda/vlsi_ir.h
··· 595 595 596 596 static inline int rd_is_active(struct ring_descr *rd) 597 597 { 598 - return ((rd->hw->rd_status & RD_ACTIVE) != 0); 598 + return (rd->hw->rd_status & RD_ACTIVE) != 0; 599 599 } 600 600 601 601 static inline void rd_activate(struct ring_descr *rd)
+16 -16
drivers/net/ixgb/ixgb_ee.c
··· 296 296 eecd_reg = IXGB_READ_REG(hw, EECD); 297 297 298 298 if (eecd_reg & IXGB_EECD_DO) 299 - return (true); 299 + return true; 300 300 301 301 udelay(50); 302 302 } 303 303 ASSERT(0); 304 - return (false); 304 + return false; 305 305 } 306 306 307 307 /****************************************************************************** ··· 327 327 checksum += ixgb_read_eeprom(hw, i); 328 328 329 329 if (checksum == (u16) EEPROM_SUM) 330 - return (true); 330 + return true; 331 331 else 332 - return (false); 332 + return false; 333 333 } 334 334 335 335 /****************************************************************************** ··· 439 439 /* End this read operation */ 440 440 ixgb_standby_eeprom(hw); 441 441 442 - return (data); 442 + return data; 443 443 } 444 444 445 445 /****************************************************************************** ··· 476 476 /* clear the init_ctrl_reg_1 to signify that the cache is 477 477 * invalidated */ 478 478 ee_map->init_ctrl_reg_1 = cpu_to_le16(EEPROM_ICW1_SIGNATURE_CLEAR); 479 - return (false); 479 + return false; 480 480 } 481 481 482 482 if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK)) 483 483 != cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) { 484 484 pr_debug("Signature invalid\n"); 485 - return(false); 485 + return false; 486 486 } 487 487 488 - return(true); 488 + return true; 489 489 } 490 490 491 491 /****************************************************************************** ··· 505 505 506 506 if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK)) 507 507 == cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) { 508 - return (true); 508 + return true; 509 509 } else { 510 510 return ixgb_get_eeprom_data(hw); 511 511 } ··· 526 526 527 527 if ((index < IXGB_EEPROM_SIZE) && 528 528 (ixgb_check_and_get_eeprom_data(hw) == true)) { 529 - return(hw->eeprom[index]); 529 + return hw->eeprom[index]; 530 530 } 531 531 532 - return(0); 532 + return 0; 533 533 } 534 534 535 535 /****************************************************************************** ··· 570 570 ixgb_get_ee_pba_number(struct ixgb_hw *hw) 571 571 { 572 572 if (ixgb_check_and_get_eeprom_data(hw) == true) 573 - return (le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG]) 574 - | (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16)); 573 + return le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG]) 574 + | (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16); 575 575 576 - return(0); 576 + return 0; 577 577 } 578 578 579 579 ··· 591 591 struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom; 592 592 593 593 if (ixgb_check_and_get_eeprom_data(hw) == true) 594 - return (le16_to_cpu(ee_map->device_id)); 594 + return le16_to_cpu(ee_map->device_id); 595 595 596 - return (0); 596 + return 0; 597 597 } 598 598
+1 -1
drivers/net/ixgb/ixgb_ethtool.c
··· 410 410 ixgb_get_eeprom_len(struct net_device *netdev) 411 411 { 412 412 /* return size in bytes */ 413 - return (IXGB_EEPROM_SIZE << 1); 413 + return IXGB_EEPROM_SIZE << 1; 414 414 } 415 415 416 416 static int
+7 -7
drivers/net/ixgb/ixgb_hw.c
··· 167 167 /* Clear any pending interrupt events. */ 168 168 icr_reg = IXGB_READ_REG(hw, ICR); 169 169 170 - return (ctrl_reg & IXGB_CTRL0_RST); 170 + return ctrl_reg & IXGB_CTRL0_RST; 171 171 } 172 172 173 173 ··· 209 209 xpak_vendor = ixgb_xpak_vendor_infineon; 210 210 } 211 211 212 - return (xpak_vendor); 212 + return xpak_vendor; 213 213 } 214 214 215 215 /****************************************************************************** ··· 273 273 if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID) 274 274 phy_type = ixgb_phy_type_bcm; 275 275 276 - return (phy_type); 276 + return phy_type; 277 277 } 278 278 279 279 /****************************************************************************** ··· 366 366 /* 82597EX errata: Call check-for-link in case lane deskew is locked */ 367 367 ixgb_check_for_link(hw); 368 368 369 - return (status); 369 + return status; 370 370 } 371 371 372 372 /****************************************************************************** ··· 531 531 } 532 532 533 533 hash_value &= 0xFFF; 534 - return (hash_value); 534 + return hash_value; 535 535 } 536 536 537 537 /****************************************************************************** ··· 715 715 } 716 716 IXGB_WRITE_REG(hw, FCRTH, hw->fc.high_water); 717 717 } 718 - return (status); 718 + return status; 719 719 } 720 720 721 721 /****************************************************************************** ··· 1140 1140 pr_debug("MAC address is all zeros\n"); 1141 1141 is_valid = false; 1142 1142 } 1143 - return (is_valid); 1143 + return is_valid; 1144 1144 } 1145 1145 1146 1146 /******************************************************************************
+3 -3
drivers/net/ixgbe/ixgbe_ethtool.c
··· 401 401 static u32 ixgbe_get_rx_csum(struct net_device *netdev) 402 402 { 403 403 struct ixgbe_adapter *adapter = netdev_priv(netdev); 404 - return (adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED); 404 + return adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED; 405 405 } 406 406 407 407 static int ixgbe_set_rx_csum(struct net_device *netdev, u32 data) ··· 988 988 case ETH_SS_STATS: 989 989 return IXGBE_STATS_LEN; 990 990 case ETH_SS_NTUPLE_FILTERS: 991 - return (ETHTOOL_MAX_NTUPLE_LIST_ENTRY * 992 - ETHTOOL_MAX_NTUPLE_STRING_PER_ENTRY); 991 + return ETHTOOL_MAX_NTUPLE_LIST_ENTRY * 992 + ETHTOOL_MAX_NTUPLE_STRING_PER_ENTRY; 993 993 default: 994 994 return -EOPNOTSUPP; 995 995 }
+1 -1
drivers/net/ixgbe/ixgbe_main.c
··· 826 826 tx_ring->total_packets += total_packets; 827 827 tx_ring->stats.packets += total_packets; 828 828 tx_ring->stats.bytes += total_bytes; 829 - return (count < tx_ring->work_limit); 829 + return count < tx_ring->work_limit; 830 830 } 831 831 832 832 #ifdef CONFIG_IXGBE_DCA
+1 -1
drivers/net/ixgbevf/ixgbevf_main.c
··· 311 311 netdev->stats.tx_bytes += total_bytes; 312 312 netdev->stats.tx_packets += total_packets; 313 313 314 - return (count < tx_ring->work_limit); 314 + return count < tx_ring->work_limit; 315 315 } 316 316 317 317 /**
+1 -1
drivers/net/ll_temac_main.c
··· 494 494 lp->options |= options; 495 495 mutex_unlock(&lp->indirect_mutex); 496 496 497 - return (0); 497 + return 0; 498 498 } 499 499 500 500 /* Initialize temac */
+1 -1
drivers/net/lp486e.c
··· 460 460 } 461 461 lp->rbd_tail->next = rfd->rbd; 462 462 #endif 463 - return (i); 463 + return i; 464 464 } 465 465 466 466 static inline void
+1 -1
drivers/net/meth.c
··· 461 461 { 462 462 struct meth_private *priv = netdev_priv(dev); 463 463 464 - return (priv->tx_count >= TX_RING_ENTRIES - 1); 464 + return priv->tx_count >= TX_RING_ENTRIES - 1; 465 465 } 466 466 467 467 static void meth_tx_cleanup(struct net_device* dev, unsigned long int_status)
+1 -1
drivers/net/mlx4/en_selftest.c
··· 107 107 mlx4_en_test_loopback_exit: 108 108 109 109 priv->validate_loopback = 0; 110 - return (!loopback_ok); 110 + return !loopback_ok; 111 111 } 112 112 113 113
+3 -3
drivers/net/myri10ge/myri10ge.c
··· 1555 1555 * valid since MSI-X irqs are not shared */ 1556 1556 if ((mgp->dev->real_num_tx_queues == 1) && (ss != mgp->ss)) { 1557 1557 napi_schedule(&ss->napi); 1558 - return (IRQ_HANDLED); 1558 + return IRQ_HANDLED; 1559 1559 } 1560 1560 1561 1561 /* make sure it is our IRQ, and that the DMA has finished */ 1562 1562 if (unlikely(!stats->valid)) 1563 - return (IRQ_NONE); 1563 + return IRQ_NONE; 1564 1564 1565 1565 /* low bit indicates receives are present, so schedule 1566 1566 * napi poll handler */ ··· 1599 1599 myri10ge_check_statblock(mgp); 1600 1600 1601 1601 put_be32(htonl(3), ss->irq_claim + 1); 1602 - return (IRQ_HANDLED); 1602 + return IRQ_HANDLED; 1603 1603 } 1604 1604 1605 1605 static int
+1 -1
drivers/net/myri_sbus.c
··· 735 735 int i; 736 736 for (i = 0; i < dev->addr_len; i++) 737 737 eth->h_dest[i] = 0; 738 - return(dev->hard_header_len); 738 + return dev->hard_header_len; 739 739 } 740 740 741 741 if (daddr) {
+2 -2
drivers/net/netxen/netxen_nic_init.c
··· 346 346 if (pci_base == NETXEN_ADDR_ERROR) 347 347 return pci_base; 348 348 else 349 - return (pci_base + offset); 349 + return pci_base + offset; 350 350 } 351 351 352 352 #define NETXEN_MAX_ROM_WAIT_USEC 100 ··· 1792 1792 done = (sw_consumer == hw_consumer); 1793 1793 spin_unlock(&adapter->tx_clean_lock); 1794 1794 1795 - return (done); 1795 + return done; 1796 1796 } 1797 1797 1798 1798 void
+1 -1
drivers/net/netxen/netxen_nic_main.c
··· 177 177 178 178 recv_ctx->sds_rings = kzalloc(size, GFP_KERNEL); 179 179 180 - return (recv_ctx->sds_rings == NULL); 180 + return recv_ctx->sds_rings == NULL; 181 181 } 182 182 183 183 static void
+6 -7
drivers/net/niu.c
··· 283 283 284 284 static u32 phy_encode(u32 type, int port) 285 285 { 286 - return (type << (port * 2)); 286 + return type << (port * 2); 287 287 } 288 288 289 289 static u32 phy_decode(u32 val, int port) ··· 3043 3043 3044 3044 static u64 hash_addr_regval(unsigned long index, unsigned long num_entries) 3045 3045 { 3046 - return ((u64)index | (num_entries == 1 ? 3047 - HASH_TBL_ADDR_AUTOINC : 0)); 3046 + return (u64)index | (num_entries == 1 ? HASH_TBL_ADDR_AUTOINC : 0); 3048 3047 } 3049 3048 3050 3049 #if 0 ··· 3275 3276 /* One entry reserved for IP fragment rule */ 3276 3277 if (idx >= (np->clas.tcam_sz - 1)) 3277 3278 idx = 0; 3278 - return (np->clas.tcam_top + ((idx+1) * np->parent->num_ports)); 3279 + return np->clas.tcam_top + ((idx+1) * np->parent->num_ports); 3279 3280 } 3280 3281 3281 3282 static u16 tcam_get_size(struct niu *np) ··· 3312 3313 a >>= PAGE_SHIFT; 3313 3314 a ^= (a >> ilog2(MAX_RBR_RING_SIZE)); 3314 3315 3315 - return (a & (MAX_RBR_RING_SIZE - 1)); 3316 + return a & (MAX_RBR_RING_SIZE - 1); 3316 3317 } 3317 3318 3318 3319 static struct page *niu_find_rxpage(struct rx_ring_info *rp, u64 addr, ··· 7795 7796 if (stringset != ETH_SS_STATS) 7796 7797 return -EINVAL; 7797 7798 7798 - return ((np->flags & NIU_FLAGS_XMAC ? 7799 + return (np->flags & NIU_FLAGS_XMAC ? 7799 7800 NUM_XMAC_STAT_KEYS : 7800 7801 NUM_BMAC_STAT_KEYS) + 7801 7802 (np->num_rx_rings * NUM_RXCHAN_STAT_KEYS) + 7802 - (np->num_tx_rings * NUM_TXCHAN_STAT_KEYS)); 7803 + (np->num_tx_rings * NUM_TXCHAN_STAT_KEYS); 7803 7804 } 7804 7805 7805 7806 static void niu_get_ethtool_stats(struct net_device *dev,
+1 -1
drivers/net/pcmcia/nmclan_cs.c
··· 521 521 spin_unlock_irqrestore(&lp->bank_lock, flags); 522 522 break; 523 523 } 524 - return (data & 0xFF); 524 + return data & 0xFF; 525 525 } /* mace_read */ 526 526 527 527 /* ----------------------------------------------------------------------------
+1 -1
drivers/net/pcmcia/smc91c92_cs.c
··· 815 815 ((s >> 8) != (s & 0xff))) { 816 816 SMC_SELECT_BANK(3); 817 817 s = inw(ioaddr + REVISION); 818 - return (s & 0xff); 818 + return s & 0xff; 819 819 } 820 820 821 821 if (width) {
+2 -2
drivers/net/pcnet32.c
··· 376 376 static int pcnet32_wio_check(unsigned long addr) 377 377 { 378 378 outw(88, addr + PCNET32_WIO_RAP); 379 - return (inw(addr + PCNET32_WIO_RAP) == 88); 379 + return inw(addr + PCNET32_WIO_RAP) == 88; 380 380 } 381 381 382 382 static struct pcnet32_access pcnet32_wio = { ··· 431 431 static int pcnet32_dwio_check(unsigned long addr) 432 432 { 433 433 outl(88, addr + PCNET32_DWIO_RAP); 434 - return ((inl(addr + PCNET32_DWIO_RAP) & 0xffff) == 88); 434 + return (inl(addr + PCNET32_DWIO_RAP) & 0xffff) == 88; 435 435 } 436 436 437 437 static struct pcnet32_access pcnet32_dwio = {
+3 -3
drivers/net/ps3_gelic_wireless.c
··· 85 85 */ 86 86 static inline int wpa2_capable(void) 87 87 { 88 - return (0 <= ps3_compare_firmware_version(2, 0, 0)); 88 + return 0 <= ps3_compare_firmware_version(2, 0, 0); 89 89 } 90 90 91 91 static inline int precise_ie(void) 92 92 { 93 - return (0 <= ps3_compare_firmware_version(2, 2, 0)); 93 + return 0 <= ps3_compare_firmware_version(2, 2, 0); 94 94 } 95 95 /* 96 96 * post_eurus_cmd helpers ··· 506 506 start[1] = (buf - start - 2); 507 507 508 508 pr_debug("%s: ->\n", __func__); 509 - return (buf - start); 509 + return buf - start; 510 510 } 511 511 512 512 struct ie_item {
+1 -1
drivers/net/qlcnic/qlcnic_main.c
··· 172 172 173 173 recv_ctx->sds_rings = kzalloc(size, GFP_KERNEL); 174 174 175 - return (recv_ctx->sds_rings == NULL); 175 + return recv_ctx->sds_rings == NULL; 176 176 } 177 177 178 178 static void
+1 -1
drivers/net/sfc/net_driver.h
··· 985 985 static inline struct efx_rx_buffer *efx_rx_buffer(struct efx_rx_queue *rx_queue, 986 986 unsigned int index) 987 987 { 988 - return (&rx_queue->buffer[index]); 988 + return &rx_queue->buffer[index]; 989 989 } 990 990 991 991 /* Set bit in a little-endian bitfield */
+5 -5
drivers/net/sfc/nic.c
··· 104 104 static inline efx_qword_t *efx_event(struct efx_channel *channel, 105 105 unsigned int index) 106 106 { 107 - return (((efx_qword_t *) (channel->eventq.addr)) + index); 107 + return ((efx_qword_t *) (channel->eventq.addr)) + index; 108 108 } 109 109 110 110 /* See if an event is present ··· 119 119 */ 120 120 static inline int efx_event_present(efx_qword_t *event) 121 121 { 122 - return (!(EFX_DWORD_IS_ALL_ONES(event->dword[0]) | 123 - EFX_DWORD_IS_ALL_ONES(event->dword[1]))); 122 + return !(EFX_DWORD_IS_ALL_ONES(event->dword[0]) | 123 + EFX_DWORD_IS_ALL_ONES(event->dword[1])); 124 124 } 125 125 126 126 static bool efx_masked_compare_oword(const efx_oword_t *a, const efx_oword_t *b, ··· 347 347 static inline efx_qword_t * 348 348 efx_tx_desc(struct efx_tx_queue *tx_queue, unsigned int index) 349 349 { 350 - return (((efx_qword_t *) (tx_queue->txd.addr)) + index); 350 + return ((efx_qword_t *) (tx_queue->txd.addr)) + index; 351 351 } 352 352 353 353 /* This writes to the TX_DESC_WPTR; write pointer for TX descriptor ring */ ··· 502 502 static inline efx_qword_t * 503 503 efx_rx_desc(struct efx_rx_queue *rx_queue, unsigned int index) 504 504 { 505 - return (((efx_qword_t *) (rx_queue->rxd.addr)) + index); 505 + return ((efx_qword_t *) (rx_queue->rxd.addr)) + index; 506 506 } 507 507 508 508 /* This creates an entry in the RX descriptor queue */
+3 -3
drivers/net/sis900.c
··· 832 832 outl(0, ee_addr); 833 833 eeprom_delay(); 834 834 835 - return (retval); 835 + return retval; 836 836 } 837 837 838 838 /* Read and write the MII management registers using software-generated ··· 2247 2247 2248 2248 /* leave 8 or 7 most siginifant bits */ 2249 2249 if ((revision >= SIS635A_900_REV) || (revision == SIS900B_900_REV)) 2250 - return ((int)(crc >> 24)); 2250 + return (int)(crc >> 24); 2251 2251 else 2252 - return ((int)(crc >> 25)); 2252 + return (int)(crc >> 25); 2253 2253 } 2254 2254 2255 2255 /**
+5 -5
drivers/net/skfp/cfm.c
··· 542 542 */ 543 543 int cfm_get_mac_input(struct s_smc *smc) 544 544 { 545 - return((smc->mib.fddiSMTCF_State == SC10_C_WRAP_B || 546 - smc->mib.fddiSMTCF_State == SC5_THRU_B) ? PB : PA) ; 545 + return (smc->mib.fddiSMTCF_State == SC10_C_WRAP_B || 546 + smc->mib.fddiSMTCF_State == SC5_THRU_B) ? PB : PA; 547 547 } 548 548 549 549 /* ··· 553 553 */ 554 554 int cfm_get_mac_output(struct s_smc *smc) 555 555 { 556 - return((smc->mib.fddiSMTCF_State == SC10_C_WRAP_B || 557 - smc->mib.fddiSMTCF_State == SC4_THRU_A) ? PB : PA) ; 556 + return (smc->mib.fddiSMTCF_State == SC10_C_WRAP_B || 557 + smc->mib.fddiSMTCF_State == SC4_THRU_A) ? PB : PA; 558 558 } 559 559 560 560 static char path_iso[] = { ··· 623 623 624 624 LINT_USE(path_index); 625 625 626 - return(len) ; 626 + return len; 627 627 }
+8 -8
drivers/net/skfp/drvfbi.c
··· 267 267 int pcm_get_s_port(struct s_smc *smc) 268 268 { 269 269 SK_UNUSED(smc) ; 270 - return(PS) ; 270 + return PS; 271 271 } 272 272 273 273 /* ··· 366 366 */ 367 367 int sm_pm_bypass_present(struct s_smc *smc) 368 368 { 369 - return( (inp(ADDR(B0_DAS)) & DAS_BYP_ST) ? TRUE: FALSE) ; 369 + return (inp(ADDR(B0_DAS)) & DAS_BYP_ST) ? TRUE : FALSE; 370 370 } 371 371 372 372 void plc_clear_irq(struct s_smc *smc, int p) ··· 483 483 484 484 for (i = 0 ; i < num ; i++) { 485 485 if (comp1[i] != comp2[i]) 486 - return (0) ; 486 + return 0; 487 487 } 488 - return (1) ; 488 + return 1; 489 489 } /* is_equal_num */ 490 490 491 491 ··· 522 522 i++ ; 523 523 break ; /* entry ok */ 524 524 default: 525 - return (1) ; /* invalid oi_status */ 525 + return 1; /* invalid oi_status */ 526 526 } 527 527 } 528 528 529 529 if (i == 0) 530 - return (2) ; 530 + return 2; 531 531 if (!act_entries) 532 - return (3) ; 532 + return 3; 533 533 534 534 /* ok, we have a valid OEM data base with an active entry */ 535 535 smc->hw.oem_id = (struct s_oem_ids *) &oem_ids[sel_id] ; 536 - return (0) ; 536 + return 0; 537 537 } 538 538 #endif /* MULT_OEM */ 539 539
+23 -23
drivers/net/skfp/ess.c
··· 135 135 */ 136 136 if (!(p = (void *) sm_to_para(smc,sm,SMT_P0015))) { 137 137 DB_ESS("ESS: RAF frame error, parameter type not found\n",0,0) ; 138 - return(fs) ; 138 + return fs; 139 139 } 140 140 msg_res_type = ((struct smt_p_0015 *)p)->res_type ; 141 141 ··· 147 147 * error in frame: para ESS command was not found 148 148 */ 149 149 DB_ESS("ESS: RAF frame error, parameter command not found\n",0,0); 150 - return(fs) ; 150 + return fs; 151 151 } 152 152 153 153 DB_ESSN(2,"fc %x ft %x\n",sm->smt_class,sm->smt_type) ; ··· 175 175 * local and no static allocation is used 176 176 */ 177 177 if (!local || smc->mib.fddiESSPayload) 178 - return(fs) ; 178 + return fs; 179 179 180 180 p = (void *) sm_to_para(smc,sm,SMT_P0019) ; 181 181 for (i = 0; i < 5; i++) { 182 182 if (((struct smt_p_0019 *)p)->alloc_addr.a[i]) { 183 - return(fs) ; 183 + return fs; 184 184 } 185 185 } 186 186 ··· 199 199 sm->smt_dest = smt_sba_da ; 200 200 201 201 if (smc->ess.local_sba_active) 202 - return(fs | I_INDICATOR) ; 202 + return fs | I_INDICATOR; 203 203 204 204 if (!(db = smt_get_mbuf(smc))) 205 - return(fs) ; 205 + return fs; 206 206 207 207 db->sm_len = mb->sm_len ; 208 208 db->sm_off = mb->sm_off ; ··· 212 212 (struct smt_header *)(db->sm_data+db->sm_off), 213 213 "RAF") ; 214 214 smt_send_frame(smc,db,FC_SMT_INFO,0) ; 215 - return(fs) ; 215 + return fs; 216 216 } 217 217 218 218 /* ··· 221 221 */ 222 222 if (smt_check_para(smc,sm,plist_raf_alc_res)) { 223 223 DB_ESS("ESS: RAF with para problem, ignoring\n",0,0) ; 224 - return(fs) ; 224 + return fs; 225 225 } 226 226 227 227 /* ··· 242 242 (sm->smt_tid != smc->ess.alloc_trans_id)) { 243 243 244 244 DB_ESS("ESS: Allocation Responce not accepted\n",0,0) ; 245 - return(fs) ; 245 + return fs; 246 246 } 247 247 248 248 /* ··· 268 268 */ 269 269 (void)process_bw_alloc(smc,(long)payload,(long)overhead) ; 270 270 271 - return(fs) ; 271 + return fs; 272 272 /* end of Process Allocation Request */ 273 273 274 274 /* ··· 280 280 */ 281 281 if (sm->smt_type != SMT_REQUEST) { 282 282 DB_ESS("ESS: Do not process Change Responses\n",0,0) ; 283 - return(fs) ; 283 + return fs; 284 284 } 285 285 286 286 /* ··· 288 288 */ 289 289 if (smt_check_para(smc,sm,plist_raf_chg_req)) { 290 290 DB_ESS("ESS: RAF with para problem, ignoring\n",0,0) ; 291 - return(fs) ; 291 + return fs; 292 292 } 293 293 294 294 /* ··· 300 300 if ((((struct smt_p_320b *)sm_to_para(smc,sm,SMT_P320B))->path_index 301 301 != PRIMARY_RING) || (msg_res_type != SYNC_BW)) { 302 302 DB_ESS("ESS: RAF frame with para problem, ignoring\n",0,0) ; 303 - return(fs) ; 303 + return fs; 304 304 } 305 305 306 306 /* ··· 319 319 * process the bandwidth allocation 320 320 */ 321 321 if(!process_bw_alloc(smc,(long)payload,(long)overhead)) 322 - return(fs) ; 322 + return fs; 323 323 324 324 /* 325 325 * send an RAF Change Reply 326 326 */ 327 327 ess_send_response(smc,sm,CHANGE_ALLOCATION) ; 328 328 329 - return(fs) ; 329 + return fs; 330 330 /* end of Process Change Request */ 331 331 332 332 /* ··· 338 338 */ 339 339 if (sm->smt_type != SMT_REQUEST) { 340 340 DB_ESS("ESS: Do not process a Report Reply\n",0,0) ; 341 - return(fs) ; 341 + return fs; 342 342 } 343 343 344 344 DB_ESSN(2,"ESS: Report Request from %s\n", ··· 349 349 */ 350 350 if (msg_res_type != SYNC_BW) { 351 351 DB_ESS("ESS: ignoring RAF with para problem\n",0,0) ; 352 - return(fs) ; 352 + return fs; 353 353 } 354 354 355 355 /* ··· 357 357 */ 358 358 ess_send_response(smc,sm,REPORT_ALLOCATION) ; 359 359 360 - return(fs) ; 360 + return fs; 361 361 /* end of Process Report Request */ 362 362 363 363 default: ··· 368 368 break ; 369 369 } 370 370 371 - return(fs) ; 371 + return fs; 372 372 } 373 373 374 374 /* ··· 418 418 */ 419 419 /* if (smt_set_obj(smc,SMT_P320F,payload,S_SET)) { 420 420 DB_ESS("ESS: SMT does not accept the payload value\n",0,0) ; 421 - return(FALSE) ; 421 + return FALSE; 422 422 } 423 423 if (smt_set_obj(smc,SMT_P3210,overhead,S_SET)) { 424 424 DB_ESS("ESS: SMT does not accept the overhead value\n",0,0) ; 425 - return(FALSE) ; 425 + return FALSE; 426 426 } */ 427 427 428 428 /* premliminary */ 429 429 if (payload > MAX_PAYLOAD || overhead > 5000) { 430 430 DB_ESS("ESS: payload / overhead not accepted\n",0,0) ; 431 - return(FALSE) ; 431 + return FALSE; 432 432 } 433 433 434 434 /* ··· 468 468 469 469 ess_config_fifo(smc) ; 470 470 set_formac_tsync(smc,smc->ess.sync_bw) ; 471 - return(TRUE) ; 471 + return TRUE; 472 472 } 473 473 474 474 static void ess_send_response(struct s_smc *smc, struct smt_header *sm,
+12 -12
drivers/net/skfp/fplustm.c
··· 112 112 u_long tneg ; 113 113 114 114 tneg = (u_long)((long)inpw(FM_A(FM_TNEG))<<5) ; 115 - return((u_long)((tneg + ((inpw(FM_A(FM_TMRS))>>10)&0x1f)) | 116 - 0xffe00000L)) ; 115 + return (u_long)((tneg + ((inpw(FM_A(FM_TMRS))>>10)&0x1f)) | 116 + 0xffe00000L) ; 117 117 } 118 118 119 119 void mac_update_counter(struct s_smc *smc) ··· 163 163 /* is used */ 164 164 p = (u_long)inpw(FM_A(FM_MDRU))<<16 ; 165 165 p += (u_long)inpw(FM_A(FM_MDRL)) ; 166 - return(p) ; 166 + return p; 167 167 } 168 168 #endif 169 169 ··· 887 887 /* make sure all PCI settings are correct */ 888 888 mac_do_pci_fix(smc) ; 889 889 890 - return(init_mac(smc,1)) ; 890 + return init_mac(smc, 1); 891 891 /* enable_formac(smc) ; */ 892 892 } 893 893 ··· 989 989 } 990 990 smc->hw.hw_state = STARTED ; 991 991 992 - return(0) ; 992 + return 0; 993 993 } 994 994 995 995 ··· 1049 1049 1050 1050 int sm_mac_get_tx_state(struct s_smc *smc) 1051 1051 { 1052 - return((inpw(FM_A(FM_STMCHN))>>4)&7) ; 1052 + return (inpw(FM_A(FM_STMCHN))>>4) & 7; 1053 1053 } 1054 1054 1055 1055 /* ··· 1084 1084 } 1085 1085 if (memcmp((char *)&tb->a,(char *)own,6)) 1086 1086 continue ; 1087 - return(tb) ; 1087 + return tb; 1088 1088 } 1089 - return(slot) ; /* return first free or NULL */ 1089 + return slot; /* return first free or NULL */ 1090 1090 } 1091 1091 1092 1092 /* ··· 1152 1152 */ 1153 1153 if (can & 0x80) { 1154 1154 if (smc->hw.fp.smt_slots_used >= SMT_MAX_MULTI) { 1155 - return(1) ; 1155 + return 1; 1156 1156 } 1157 1157 } 1158 1158 else { 1159 1159 if (smc->hw.fp.os_slots_used >= FPMAX_MULTICAST-SMT_MAX_MULTI) { 1160 - return(1) ; 1160 + return 1; 1161 1161 } 1162 1162 } 1163 1163 ··· 1165 1165 * find empty slot 1166 1166 */ 1167 1167 if (!(tb = mac_get_mc_table(smc,addr,&own,0,can & ~0x80))) 1168 - return(1) ; 1168 + return 1; 1169 1169 tb->n++ ; 1170 1170 tb->a = own ; 1171 1171 tb->perm = (can & 0x80) ? 1 : 0 ; ··· 1175 1175 else 1176 1176 smc->hw.fp.os_slots_used++ ; 1177 1177 1178 - return(0) ; 1178 + return 0; 1179 1179 } 1180 1180 1181 1181 /*
+15 -15
drivers/net/skfp/hwmtm.c
··· 232 232 #ifdef COMMON_MB_POOL 233 233 call_count++ ; 234 234 if (call_count == 1) { 235 - return(EXT_VIRT_MEM) ; 235 + return EXT_VIRT_MEM; 236 236 } 237 237 else { 238 - return(EXT_VIRT_MEM_2) ; 238 + return EXT_VIRT_MEM_2; 239 239 } 240 240 #else 241 - return (EXT_VIRT_MEM) ; 241 + return EXT_VIRT_MEM; 242 242 #endif 243 243 #else 244 - return (0) ; 244 + return 0; 245 245 #endif 246 246 } 247 247 ··· 271 271 if (!(smc->os.hwm.descr_p = (union s_fp_descr volatile *) 272 272 mac_drv_get_desc_mem(smc,(u_int) 273 273 (RXD_TXD_COUNT+1)*sizeof(struct s_smt_fp_txd)))) { 274 - return(1) ; /* no space the hwm modul can't work */ 274 + return 1; /* no space the hwm modul can't work */ 275 275 } 276 276 277 277 /* ··· 283 283 #ifndef COMMON_MB_POOL 284 284 if (!(smc->os.hwm.mbuf_pool.mb_start = (SMbuf *) mac_drv_get_space(smc, 285 285 MAX_MBUF*sizeof(SMbuf)))) { 286 - return(1) ; /* no space the hwm modul can't work */ 286 + return 1; /* no space the hwm modul can't work */ 287 287 } 288 288 #else 289 289 if (!mb_start) { 290 290 if (!(mb_start = (SMbuf *) mac_drv_get_space(smc, 291 291 MAX_MBUF*sizeof(SMbuf)))) { 292 - return(1) ; /* no space the hwm modul can't work */ 292 + return 1; /* no space the hwm modul can't work */ 293 293 } 294 294 } 295 295 #endif 296 296 #endif 297 - return (0) ; 297 + return 0; 298 298 } 299 299 300 300 /* ··· 349 349 DRV_BUF_FLUSH(&d1->r,DDI_DMA_SYNC_FORDEV) ; 350 350 d1++; 351 351 } 352 - return(phys) ; 352 + return phys; 353 353 } 354 354 355 355 static void init_txd_ring(struct s_smc *smc) ··· 502 502 mb->sm_use_count = 1 ; 503 503 } 504 504 DB_GEN("get SMbuf: mb = %x",(void *)mb,0,3) ; 505 - return (mb) ; /* May be NULL */ 505 + return mb; /* May be NULL */ 506 506 } 507 507 508 508 void smt_free_mbuf(struct s_smc *smc, SMbuf *mb) ··· 621 621 t = t->txd_next ; 622 622 tx_used-- ; 623 623 } 624 - return(phys) ; 624 + return phys; 625 625 } 626 626 627 627 /* ··· 673 673 r = r->rxd_next ; 674 674 rx_used-- ; 675 675 } 676 - return(phys) ; 676 + return phys; 677 677 } 678 678 679 679 ··· 1595 1595 } 1596 1596 DB_TX("frame_status = %x",frame_status,0,3) ; 1597 1597 NDD_TRACE("THiE",frame_status,smc->os.hwm.tx_p->tx_free,0) ; 1598 - return(frame_status) ; 1598 + return frame_status; 1599 1599 } 1600 1600 1601 1601 /* ··· 1764 1764 smc->os.hwm.llc_rx_pipe = mb->sm_next ; 1765 1765 } 1766 1766 DB_GEN("get_llc_rx: mb = 0x%x",(void *)mb,0,4) ; 1767 - return(mb) ; 1767 + return mb; 1768 1768 } 1769 1769 1770 1770 /* ··· 1797 1797 smc->os.hwm.txd_tx_pipe = mb->sm_next ; 1798 1798 } 1799 1799 DB_GEN("get_txd_mb: mb = 0x%x",(void *)mb,0,4) ; 1800 - return(mb) ; 1800 + return mb; 1801 1801 } 1802 1802 1803 1803 /*
+2 -2
drivers/net/skfp/hwt.c
··· 179 179 else 180 180 smc->hw.t_stop = smc->hw.t_start - tr ; 181 181 } 182 - return (smc->hw.t_stop) ; 182 + return smc->hw.t_stop; 183 183 } 184 184 185 185 #ifdef PCI ··· 208 208 outpw(ADDR(B2_TI_CRTL), TIM_START) ; 209 209 outpd(ADDR(B2_TI_INI),interval) ; 210 210 211 - return(time) ; 211 + return time; 212 212 } 213 213 214 214 /************************
+11 -11
drivers/net/skfp/pcmplc.c
··· 504 504 505 505 #ifdef CONCENTRATOR 506 506 if (!plc_is_installed(smc,phy)) 507 - return(PC_QLS) ; 507 + return PC_QLS; 508 508 #endif 509 509 510 510 state = inpw(PLC(phy,PL_STATUS_A)) & PL_LINE_ST ; ··· 528 528 default : 529 529 state = PC_LS_NONE ; 530 530 } 531 - return(state) ; 531 + return state; 532 532 } 533 533 534 534 static int plc_send_bits(struct s_smc *smc, struct s_phy *phy, int len) ··· 547 547 #if 0 548 548 printf("PL_PCM_SIGNAL is set\n") ; 549 549 #endif 550 - return(1) ; 550 + return 1; 551 551 } 552 552 /* write bit[n] & length = 1 to regs */ 553 553 outpw(PLC(np,PL_VECTOR_LEN),len-1) ; /* len=nr-1 */ ··· 562 562 printf("SIGNALING bit %d .. %d\n",phy->bitn,phy->bitn+len-1) ; 563 563 #endif 564 564 #endif 565 - return(0) ; 565 + return 0; 566 566 } 567 567 568 568 /* ··· 1590 1590 { 1591 1591 int twist = 0 ; 1592 1592 if (smc->s.sas != SMT_DAS) 1593 - return(0) ; 1593 + return 0; 1594 1594 if (smc->y[PA].twisted && (smc->y[PA].mib->fddiPORTPCMState == PC8_ACTIVE)) 1595 1595 twist |= 1 ; 1596 1596 if (smc->y[PB].twisted && (smc->y[PB].mib->fddiPORTPCMState == PC8_ACTIVE)) 1597 1597 twist |= 2 ; 1598 - return(twist) ; 1598 + return twist; 1599 1599 } 1600 1600 1601 1601 /* ··· 1636 1636 for (n = 0 ; n < NUMPHYS ; n++) { 1637 1637 if (smc->y[n].mib->fddiPORTPCMState == PC8_ACTIVE && 1638 1638 smc->y[n].mib->fddiPORTNeighborType == TM) 1639 - return(0) ; 1639 + return 0; 1640 1640 } 1641 - return(1) ; 1641 + return 1; 1642 1642 } 1643 1643 1644 1644 /* ··· 1915 1915 case PL_PC9 : pcs = PC_MAINT ; break ; 1916 1916 default : pcs = PC_DISABLE ; break ; 1917 1917 } 1918 - return(pcs) ; 1918 + return pcs; 1919 1919 } 1920 1920 1921 1921 char *get_linestate(struct s_smc *smc, int np) ··· 1937 1937 default: ls = "unknown" ; break ; 1938 1938 #endif 1939 1939 } 1940 - return(ls) ; 1940 + return ls; 1941 1941 } 1942 1942 1943 1943 char *get_pcmstate(struct s_smc *smc, int np) ··· 1959 1959 case PL_PC9 : pcs = "MAINT" ; break ; 1960 1960 default : pcs = "UNKNOWN" ; break ; 1961 1961 } 1962 - return(pcs) ; 1962 + return pcs; 1963 1963 } 1964 1964 1965 1965 void list_phy(struct s_smc *smc)
+30 -32
drivers/net/skfp/pmf.c
··· 328 328 * build SMT header 329 329 */ 330 330 if (!(mb = smt_get_mbuf(smc))) 331 - return(mb) ; 331 + return mb; 332 332 333 333 smt = smtod(mb, struct smt_header *) ; 334 334 smt->smt_dest = req->smt_source ; /* DA == source of request */ ··· 493 493 smt_add_para(smc,&set_pcon,(u_short) SMT_P1035,0,0) ; 494 494 smt_add_para(smc,&set_pcon,(u_short) SMT_P1036,0,0) ; 495 495 } 496 - return(mb) ; 496 + return mb; 497 497 } 498 498 499 499 static int smt_authorize(struct s_smc *smc, struct smt_header *sm) ··· 511 511 if (i != 8) { 512 512 if (memcmp((char *) &sm->smt_sid, 513 513 (char *) &smc->mib.fddiPRPMFStation,8)) 514 - return(1) ; 514 + return 1; 515 515 } 516 516 /* 517 517 * check authoriziation parameter if passwd not zero ··· 522 522 if (i != 8) { 523 523 pa = (struct smt_para *) sm_to_para(smc,sm,SMT_P_AUTHOR) ; 524 524 if (!pa) 525 - return(1) ; 525 + return 1; 526 526 if (pa->p_len != 8) 527 - return(1) ; 527 + return 1; 528 528 if (memcmp((char *)(pa+1),(char *)smc->mib.fddiPRPMFPasswd,8)) 529 - return(1) ; 529 + return 1; 530 530 } 531 - return(0) ; 531 + return 0; 532 532 } 533 533 534 534 static int smt_check_set_count(struct s_smc *smc, struct smt_header *sm) ··· 542 542 if ((smc->mib.fddiSMTSetCount.count != sc->count) || 543 543 memcmp((char *) smc->mib.fddiSMTSetCount.timestamp, 544 544 (char *)sc->timestamp,8)) 545 - return(1) ; 545 + return 1; 546 546 } 547 - return(0) ; 547 + return 0; 548 548 } 549 549 550 550 void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para, ··· 1109 1109 break ; 1110 1110 case 0x2000 : 1111 1111 if (mac < 0 || mac >= NUMMACS) { 1112 - return(SMT_RDF_NOPARAM) ; 1112 + return SMT_RDF_NOPARAM; 1113 1113 } 1114 1114 mib_m = &smc->mib.m[mac] ; 1115 1115 mib_addr = (char *) mib_m ; ··· 1118 1118 break ; 1119 1119 case 0x3000 : 1120 1120 if (path < 0 || path >= NUMPATHS) { 1121 - return(SMT_RDF_NOPARAM) ; 1121 + return SMT_RDF_NOPARAM; 1122 1122 } 1123 1123 mib_a = &smc->mib.a[path] ; 1124 1124 mib_addr = (char *) mib_a ; ··· 1127 1127 break ; 1128 1128 case 0x4000 : 1129 1129 if (port < 0 || port >= smt_mib_phys(smc)) { 1130 - return(SMT_RDF_NOPARAM) ; 1130 + return SMT_RDF_NOPARAM; 1131 1131 } 1132 1132 mib_p = &smc->mib.p[port_to_mib(smc,port)] ; 1133 1133 mib_addr = (char *) mib_p ; ··· 1151 1151 case SMT_P10F9 : 1152 1152 #endif 1153 1153 case SMT_P20F1 : 1154 - if (!local) { 1155 - return(SMT_RDF_NOPARAM) ; 1156 - } 1154 + if (!local) 1155 + return SMT_RDF_NOPARAM; 1157 1156 break ; 1158 1157 } 1159 1158 pt = smt_get_ptab(pa->p_type) ; 1160 - if (!pt) { 1161 - return( (pa->p_type & 0xff00) ? SMT_RDF_NOPARAM : 1162 - SMT_RDF_ILLEGAL ) ; 1163 - } 1159 + if (!pt) 1160 + return (pa->p_type & 0xff00) ? SMT_RDF_NOPARAM : 1161 + SMT_RDF_ILLEGAL; 1164 1162 switch (pt->p_access) { 1165 1163 case AC_GR : 1166 1164 case AC_S : 1167 1165 break ; 1168 1166 default : 1169 - return(SMT_RDF_ILLEGAL) ; 1167 + return SMT_RDF_ILLEGAL; 1170 1168 } 1171 1169 to = mib_addr + pt->p_offset ; 1172 1170 swap = pt->p_swap ; /* pointer to swap string */ ··· 1290 1292 break ; 1291 1293 default : 1292 1294 SMT_PANIC(smc,SMT_E0120, SMT_E0120_MSG) ; 1293 - return(SMT_RDF_ILLEGAL) ; 1295 + return SMT_RDF_ILLEGAL; 1294 1296 } 1295 1297 } 1296 1298 /* ··· 1499 1501 default : 1500 1502 break ; 1501 1503 } 1502 - return(0) ; 1504 + return 0; 1503 1505 1504 1506 val_error: 1505 1507 /* parameter value in frame is out of range */ 1506 - return(SMT_RDF_RANGE) ; 1508 + return SMT_RDF_RANGE; 1507 1509 1508 1510 len_error: 1509 1511 /* parameter value in frame is too short */ 1510 - return(SMT_RDF_LENGTH) ; 1512 + return SMT_RDF_LENGTH; 1511 1513 1512 1514 #if 0 1513 1515 no_author_error: ··· 1516 1518 * because SBA denied is not a valid return code in the 1517 1519 * PMF protocol. 1518 1520 */ 1519 - return(SMT_RDF_AUTHOR) ; 1521 + return SMT_RDF_AUTHOR; 1520 1522 #endif 1521 1523 } 1522 1524 ··· 1525 1527 const struct s_p_tab *pt ; 1526 1528 for (pt = p_tab ; pt->p_num && pt->p_num != para ; pt++) 1527 1529 ; 1528 - return(pt->p_num ? pt : NULL) ; 1530 + return pt->p_num ? pt : NULL; 1529 1531 } 1530 1532 1531 1533 static int smt_mib_phys(struct s_smc *smc) ··· 1533 1535 #ifdef CONCENTRATOR 1534 1536 SK_UNUSED(smc) ; 1535 1537 1536 - return(NUMPHYS) ; 1538 + return NUMPHYS; 1537 1539 #else 1538 1540 if (smc->s.sas == SMT_SAS) 1539 - return(1) ; 1540 - return(NUMPHYS) ; 1541 + return 1; 1542 + return NUMPHYS; 1541 1543 #endif 1542 1544 } 1543 1545 ··· 1546 1548 #ifdef CONCENTRATOR 1547 1549 SK_UNUSED(smc) ; 1548 1550 1549 - return(p) ; 1551 + return p; 1550 1552 #else 1551 1553 if (smc->s.sas == SMT_SAS) 1552 - return(PS) ; 1553 - return(p) ; 1554 + return PS; 1555 + return p; 1554 1556 #endif 1555 1557 } 1556 1558
+1 -1
drivers/net/skfp/queue.c
··· 128 128 { 129 129 queue_event(smc,EVENT_ECM,on ? EC_CONNECT : EC_DISCONNECT) ; 130 130 ev_dispatcher(smc) ; 131 - return(smc->mib.fddiSMTCF_State) ; 131 + return smc->mib.fddiSMTCF_State; 132 132 } 133 133 134 134 /*
+16 -16
drivers/net/skfp/skfddi.c
··· 440 440 441 441 smt_reset_defaults(smc, 0); 442 442 443 - return (0); 443 + return 0; 444 444 445 445 fail: 446 446 if (bp->SharedMemAddr) { ··· 516 516 mac_drv_rx_mode(smc, RX_DISABLE_PROMISC); 517 517 518 518 netif_start_queue(dev); 519 - return (0); 519 + return 0; 520 520 } // skfp_open 521 521 522 522 ··· 565 565 skb_queue_purge(&bp->SendSkbQueue); 566 566 bp->QueueSkb = MAX_TX_QUEUE_LEN; 567 567 568 - return (0); 568 + return 0; 569 569 } // skfp_close 570 570 571 571 ··· 794 794 bp->stats.port_lem_cts[1] = bp->cmd_rsp_virt->cntrs_get.cntrs.link_errors[1].ls; 795 795 796 796 #endif 797 - return ((struct net_device_stats *) &bp->os.MacStat); 797 + return (struct net_device_stats *)&bp->os.MacStat; 798 798 } // ctl_get_stat 799 799 800 800 ··· 932 932 ResetAdapter(smc); 933 933 spin_unlock_irqrestore(&bp->DriverLock, Flags); 934 934 935 - return (0); /* always return zero */ 935 + return 0; /* always return zero */ 936 936 } // skfp_ctl_set_mac_address 937 937 938 938 ··· 1313 1313 1314 1314 if ((smc->os.SharedMemHeap + size) > smc->os.SharedMemSize) { 1315 1315 printk("Unexpected SMT memory size requested: %d\n", size); 1316 - return (NULL); 1316 + return NULL; 1317 1317 } 1318 1318 smc->os.SharedMemHeap += size; // Move heap pointer. 1319 1319 ··· 1322 1322 pr_debug("bus addr: %lx\n", (ulong) 1323 1323 (smc->os.SharedMemDMA + 1324 1324 ((char *) virt - (char *)smc->os.SharedMemAddr))); 1325 - return (virt); 1325 + return virt; 1326 1326 } // mac_drv_get_space 1327 1327 1328 1328 ··· 1363 1363 1364 1364 if (!mac_drv_get_space(smc, size)) { 1365 1365 printk("fddi: Unable to align descriptor memory.\n"); 1366 - return (NULL); 1366 + return NULL; 1367 1367 } 1368 - return (virt + size); 1368 + return virt + size; 1369 1369 } // mac_drv_get_desc_mem 1370 1370 1371 1371 ··· 1384 1384 ************************/ 1385 1385 unsigned long mac_drv_virt2phys(struct s_smc *smc, void *virt) 1386 1386 { 1387 - return (smc->os.SharedMemDMA + 1388 - ((char *) virt - (char *)smc->os.SharedMemAddr)); 1387 + return smc->os.SharedMemDMA + 1388 + ((char *) virt - (char *)smc->os.SharedMemAddr); 1389 1389 } // mac_drv_virt2phys 1390 1390 1391 1391 ··· 1419 1419 ************************/ 1420 1420 u_long dma_master(struct s_smc * smc, void *virt, int len, int flag) 1421 1421 { 1422 - return (smc->os.SharedMemDMA + 1423 - ((char *) virt - (char *)smc->os.SharedMemAddr)); 1422 + return smc->os.SharedMemDMA + 1423 + ((char *) virt - (char *)smc->os.SharedMemAddr); 1424 1424 } // dma_master 1425 1425 1426 1426 ··· 1904 1904 pr_debug("fddi: Discard invalid local SMT frame\n"); 1905 1905 pr_debug(" len=%d, la_len=%d, (ULONG) look_ahead=%08lXh.\n", 1906 1906 len, la_len, (unsigned long) look_ahead); 1907 - return (0); 1907 + return 0; 1908 1908 } 1909 1909 skb = alloc_skb(len + 3, GFP_ATOMIC); 1910 1910 if (!skb) { 1911 1911 pr_debug("fddi: Local SMT: skb memory exhausted.\n"); 1912 - return (0); 1912 + return 0; 1913 1913 } 1914 1914 skb_reserve(skb, 3); 1915 1915 skb_put(skb, len); ··· 1919 1919 skb->protocol = fddi_type_trans(skb, smc->os.dev); 1920 1920 netif_rx(skb); 1921 1921 1922 - return (0); 1922 + return 0; 1923 1923 } // mac_drv_rx_init 1924 1924 1925 1925
+39 -39
drivers/net/skfp/smt.c
··· 127 127 128 128 static inline int is_broadcast(const struct fddi_addr *addr) 129 129 { 130 - return(*(u_short *)(&addr->a[0]) == 0xffff && 130 + return *(u_short *)(&addr->a[0]) == 0xffff && 131 131 *(u_short *)(&addr->a[2]) == 0xffff && 132 - *(u_short *)(&addr->a[4]) == 0xffff ) ; 132 + *(u_short *)(&addr->a[4]) == 0xffff; 133 133 } 134 134 135 135 static inline int is_individual(const struct fddi_addr *addr) 136 136 { 137 - return(!(addr->a[0] & GROUP_ADDR)) ; 137 + return !(addr->a[0] & GROUP_ADDR); 138 138 } 139 139 140 140 static inline int is_equal(const struct fddi_addr *addr1, 141 141 const struct fddi_addr *addr2) 142 142 { 143 - return(*(u_short *)(&addr1->a[0]) == *(u_short *)(&addr2->a[0]) && 143 + return *(u_short *)(&addr1->a[0]) == *(u_short *)(&addr2->a[0]) && 144 144 *(u_short *)(&addr1->a[2]) == *(u_short *)(&addr2->a[2]) && 145 - *(u_short *)(&addr1->a[4]) == *(u_short *)(&addr2->a[4]) ) ; 145 + *(u_short *)(&addr1->a[4]) == *(u_short *)(&addr2->a[4]); 146 146 } 147 147 148 148 /* ··· 457 457 else 458 458 upper <<= 16L ; 459 459 if (!lower) 460 - return(0) ; 461 - return((int)(upper/lower)) ; 460 + return 0; 461 + return (int)(upper/lower) ; 462 462 } 463 463 464 464 #ifndef SLIM_SMT ··· 1111 1111 1112 1112 #if 0 1113 1113 if (!smc->r.sm_ma_avail) { 1114 - return(0) ; 1114 + return 0; 1115 1115 } 1116 1116 #endif 1117 1117 if (!(mb = smt_get_mbuf(smc))) 1118 - return(mb) ; 1118 + return mb; 1119 1119 1120 1120 mb->sm_len = length ; 1121 1121 smt = smtod(mb, struct smt_header *) ; ··· 1136 1136 smt->smt_tid = smt_get_tid(smc) ; /* set transaction ID */ 1137 1137 smt->smt_pad = 0 ; 1138 1138 smt->smt_len = length - sizeof(struct smt_header) ; 1139 - return(mb) ; 1139 + return mb; 1140 1140 } 1141 1141 1142 1142 static void smt_add_frame_len(SMbuf *mb, int len) ··· 1375 1375 pd_mac = (struct smt_mac_rec *) phy ; 1376 1376 pd_mac->mac_addr = smc->mib.m[MAC0].fddiMACSMTAddress ; 1377 1377 pd_mac->mac_resource_idx = mac_con_resource_index(smc,1) ; 1378 - return(len) ; 1378 + return len; 1379 1379 } 1380 1380 1381 1381 /* ··· 1563 1563 u_long tid ; 1564 1564 while ((tid = ++(smc->sm.smt_tid) ^ SMT_TID_MAGIC) == 0) 1565 1565 ; 1566 - return(tid & 0x3fffffffL) ; 1566 + return tid & 0x3fffffffL; 1567 1567 } 1568 1568 1569 1569 ··· 1654 1654 while (*p) { 1655 1655 if (!sm_to_para(smc,sm,(int) *p)) { 1656 1656 DB_SMT("SMT: smt_check_para - missing para %x\n",*p,0); 1657 - return(-1) ; 1657 + return -1; 1658 1658 } 1659 1659 p++ ; 1660 1660 } 1661 - return(0) ; 1661 + return 0; 1662 1662 } 1663 1663 1664 1664 void *sm_to_para(struct s_smc *smc, struct smt_header *sm, int para) ··· 1687 1687 return NULL; 1688 1688 } 1689 1689 if (found) 1690 - return(found) ; 1690 + return found; 1691 1691 } 1692 1692 return NULL; 1693 1693 } ··· 1732 1732 string[i * 3 + 2] = ':'; 1733 1733 } 1734 1734 string[5 * 3 + 2] = 0; 1735 - return(string); 1735 + return string; 1736 1736 } 1737 1737 #endif 1738 1738 ··· 1742 1742 if (argc >= 2 && !strcmp(argv[0],"opt_bypass") && 1743 1743 !strcmp(argv[1],"yes")) { 1744 1744 smc->mib.fddiSMTBypassPresent = 1 ; 1745 - return(0) ; 1745 + return 0; 1746 1746 } 1747 - return(amdfddi_config(0,argc,argv)) ; 1747 + return amdfddi_config(0, argc, argv); 1748 1748 } 1749 1749 #endif 1750 1750 ··· 1756 1756 SK_UNUSED(mac) ; 1757 1757 #ifdef CONCENTRATOR 1758 1758 SK_UNUSED(smc) ; 1759 - return(NUMPHYS+1) ; 1759 + return NUMPHYS + 1; 1760 1760 #else 1761 - return((smc->s.sas == SMT_SAS) ? 2 : 3) ; 1761 + return (smc->s.sas == SMT_SAS) ? 2 : 3; 1762 1762 #endif 1763 1763 } 1764 1764 ··· 1768 1768 static int phy_index(struct s_smc *smc, int phy) 1769 1769 { 1770 1770 SK_UNUSED(smc) ; 1771 - return(phy+1); 1771 + return phy + 1; 1772 1772 } 1773 1773 1774 1774 /* ··· 1779 1779 #ifdef CONCENTRATOR 1780 1780 SK_UNUSED(smc) ; 1781 1781 SK_UNUSED(mac) ; 1782 - return(entity_to_index(smc,cem_get_downstream(smc,ENTITY_MAC))) ; 1782 + return entity_to_index(smc, cem_get_downstream(smc, ENTITY_MAC)); 1783 1783 #else 1784 1784 SK_UNUSED(mac) ; 1785 1785 switch (smc->mib.fddiSMTCF_State) { 1786 1786 case SC9_C_WRAP_A : 1787 1787 case SC5_THRU_B : 1788 1788 case SC11_C_WRAP_S : 1789 - return(1) ; 1789 + return 1; 1790 1790 case SC10_C_WRAP_B : 1791 1791 case SC4_THRU_A : 1792 - return(2) ; 1792 + return 2; 1793 1793 } 1794 - return(smc->s.sas == SMT_SAS ? 2 : 3) ; 1794 + return smc->s.sas == SMT_SAS ? 2 : 3; 1795 1795 #endif 1796 1796 } 1797 1797 ··· 1801 1801 static int phy_con_resource_index(struct s_smc *smc, int phy) 1802 1802 { 1803 1803 #ifdef CONCENTRATOR 1804 - return(entity_to_index(smc,cem_get_downstream(smc,ENTITY_PHY(phy)))) ; 1804 + return entity_to_index(smc, cem_get_downstream(smc, ENTITY_PHY(phy))) ; 1805 1805 #else 1806 1806 switch (smc->mib.fddiSMTCF_State) { 1807 1807 case SC9_C_WRAP_A : 1808 - return(phy == PA ? 3 : 2) ; 1808 + return phy == PA ? 3 : 2; 1809 1809 case SC10_C_WRAP_B : 1810 - return(phy == PA ? 1 : 3) ; 1810 + return phy == PA ? 1 : 3; 1811 1811 case SC4_THRU_A : 1812 - return(phy == PA ? 3 : 1) ; 1812 + return phy == PA ? 3 : 1; 1813 1813 case SC5_THRU_B : 1814 - return(phy == PA ? 2 : 3) ; 1814 + return phy == PA ? 2 : 3; 1815 1815 case SC11_C_WRAP_S : 1816 - return(2) ; 1816 + return 2; 1817 1817 } 1818 - return(phy) ; 1818 + return phy; 1819 1819 #endif 1820 1820 } 1821 1821 ··· 1823 1823 static int entity_to_index(struct s_smc *smc, int e) 1824 1824 { 1825 1825 if (e == ENTITY_MAC) 1826 - return(mac_index(smc,1)) ; 1826 + return mac_index(smc, 1); 1827 1827 else 1828 - return(phy_index(smc,e - ENTITY_PHY(0))) ; 1828 + return phy_index(smc, e - ENTITY_PHY(0)); 1829 1829 } 1830 1830 #endif 1831 1831 1832 1832 #ifdef LITTLE_ENDIAN 1833 1833 static int smt_swap_short(u_short s) 1834 1834 { 1835 - return(((s>>8)&0xff)|((s&0xff)<<8)) ; 1835 + return ((s>>8)&0xff) | ((s&0xff)<<8); 1836 1836 } 1837 1837 1838 1838 void smt_swap_para(struct smt_header *sm, int len, int direction) ··· 1996 1996 } 1997 1997 break ; 1998 1998 default : 1999 - return(1) ; 1999 + return 1; 2000 2000 } 2001 2001 break ; 2002 2002 case SMT_PORT_ACTION : ··· 2017 2017 event = PC_STOP ; 2018 2018 break ; 2019 2019 default : 2020 - return(1) ; 2020 + return 1; 2021 2021 } 2022 2022 queue_event(smc,EVENT_PCM+index,event) ; 2023 2023 break ; 2024 2024 default : 2025 - return(1) ; 2025 + return 1; 2026 2026 } 2027 - return(0) ; 2027 + return 0; 2028 2028 } 2029 2029 2030 2030 /*
+2 -2
drivers/net/skfp/smtdef.c
··· 303 303 FDDI_SMT_EVENT, (u_long) FDDI_REMOTE_T_REQ, 304 304 smt_get_event_word(smc)); 305 305 } 306 - return(st) ; 306 + return st; 307 307 } 308 308 309 309 void smt_fixup_mib(struct s_smc *smc) ··· 350 350 *oper = limit ; 351 351 else 352 352 *oper = mib ; 353 - return(old != *oper) ; 353 + return old != *oper; 354 354 } 355 355
+1 -1
drivers/net/skfp/smtinit.c
··· 120 120 121 121 PNMI_INIT(smc) ; /* PNMI initialization */ 122 122 123 - return(0) ; 123 + return 0; 124 124 } 125 125
+1 -1
drivers/net/skfp/srf.c
··· 165 165 166 166 for (i = 0, evc = smc->evcs ; (unsigned) i < MAX_EVCS ; i++, evc++) { 167 167 if (evc->evc_code == code && evc->evc_index == index) 168 - return(evc) ; 168 + return evc; 169 169 } 170 170 return NULL; 171 171 }
+1 -1
drivers/net/slip.c
··· 944 944 } 945 945 } 946 946 *ptr++ = END; 947 - return (ptr - d); 947 + return ptr - d; 948 948 } 949 949 950 950 static void slip_unesc(struct slip *sl, unsigned char s)
+2 -2
drivers/net/sun3lance.c
··· 436 436 DPRINTK( 2, ( "lance_open(): opening %s failed, i=%d, csr0=%04x\n", 437 437 dev->name, i, DREG )); 438 438 DREG = CSR0_STOP; 439 - return( -EIO ); 439 + return -EIO; 440 440 } 441 441 442 442 DREG = CSR0_IDON | CSR0_STRT | CSR0_INEA; ··· 445 445 446 446 DPRINTK( 2, ( "%s: LANCE is open, csr0 %04x\n", dev->name, DREG )); 447 447 448 - return( 0 ); 448 + return 0; 449 449 } 450 450 451 451
+1 -1
drivers/net/sungem_phy.c
··· 88 88 if ((val & BMCR_ISOLATE) && limit > 0) 89 89 __phy_write(phy, phy_id, MII_BMCR, val & ~BMCR_ISOLATE); 90 90 91 - return (limit <= 0); 91 + return limit <= 0; 92 92 } 93 93 94 94 static int bcm5201_init(struct mii_phy* phy)
+1 -1
drivers/net/sunhme.c
··· 2497 2497 hp->sw_bmcr = happy_meal_tcvr_read(hp, hp->tcvregs, MII_BMCR); 2498 2498 spin_unlock_irq(&hp->happy_lock); 2499 2499 2500 - return (hp->sw_bmsr & BMSR_LSTATUS); 2500 + return hp->sw_bmsr & BMSR_LSTATUS; 2501 2501 } 2502 2502 2503 2503 static const struct ethtool_ops hme_ethtool_ops = {
+1 -1
drivers/net/sunqe.c
··· 711 711 phyconfig = sbus_readb(mregs + MREGS_PHYCONFIG); 712 712 spin_unlock_irq(&qep->lock); 713 713 714 - return (phyconfig & MREGS_PHYCONFIG_LSTAT); 714 + return phyconfig & MREGS_PHYCONFIG_LSTAT; 715 715 } 716 716 717 717 static const struct ethtool_ops qe_ethtool_ops = {
+1 -1
drivers/net/tc35815.c
··· 1167 1167 static int tc35815_tx_full(struct net_device *dev) 1168 1168 { 1169 1169 struct tc35815_local *lp = netdev_priv(dev); 1170 - return ((lp->tfd_start + 1) % TX_FD_NUM == lp->tfd_end); 1170 + return (lp->tfd_start + 1) % TX_FD_NUM == lp->tfd_end; 1171 1171 } 1172 1172 1173 1173 static void tc35815_restart(struct net_device *dev)
+2 -3
drivers/net/tg3.c
··· 5389 5389 { 5390 5390 u32 base = (u32) mapping & 0xffffffff; 5391 5391 5392 - return ((base > 0xffffdcc0) && 5393 - (base + len + 8 < base)); 5392 + return (base > 0xffffdcc0) && (base + len + 8 < base); 5394 5393 } 5395 5394 5396 5395 /* Test for DMA addresses > 40-bit */ ··· 5398 5399 { 5399 5400 #if defined(CONFIG_HIGHMEM) && (BITS_PER_LONG == 64) 5400 5401 if (tp->tg3_flags & TG3_FLAG_40BIT_DMA_BUG) 5401 - return (((u64) mapping + len) > DMA_BIT_MASK(40)); 5402 + return ((u64) mapping + len) > DMA_BIT_MASK(40); 5402 5403 return 0; 5403 5404 #else 5404 5405 return 0;
+1 -1
drivers/net/tlan.c
··· 3187 3187 TLan_SetBit( TLAN_NET_SIO_EDATA, sio ); 3188 3188 } 3189 3189 3190 - return ( err ); 3190 + return err; 3191 3191 3192 3192 } /* TLan_EeSendByte */ 3193 3193
+4 -4
drivers/net/tlan.h
··· 442 442 static inline u8 TLan_DioRead8(u16 base_addr, u16 internal_addr) 443 443 { 444 444 outw(internal_addr, base_addr + TLAN_DIO_ADR); 445 - return (inb((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x3))); 445 + return inb((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x3)); 446 446 447 447 } /* TLan_DioRead8 */ 448 448 ··· 452 452 static inline u16 TLan_DioRead16(u16 base_addr, u16 internal_addr) 453 453 { 454 454 outw(internal_addr, base_addr + TLAN_DIO_ADR); 455 - return (inw((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x2))); 455 + return inw((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x2)); 456 456 457 457 } /* TLan_DioRead16 */ 458 458 ··· 462 462 static inline u32 TLan_DioRead32(u16 base_addr, u16 internal_addr) 463 463 { 464 464 outw(internal_addr, base_addr + TLAN_DIO_ADR); 465 - return (inl(base_addr + TLAN_DIO_DATA)); 465 + return inl(base_addr + TLAN_DIO_DATA); 466 466 467 467 } /* TLan_DioRead32 */ 468 468 ··· 537 537 hash ^= ((a[2]^a[5])<<4); /* & 060 */ 538 538 hash ^= ((a[2]^a[5])>>2); /* & 077 */ 539 539 540 - return (hash & 077); 540 + return hash & 077; 541 541 } 542 542 #endif
+1 -1
drivers/net/tokenring/proteon.c
··· 110 110 } 111 111 112 112 dev->base_addr = ioaddr; 113 - return (0); 113 + return 0; 114 114 nodev: 115 115 release_region(ioaddr, PROTEON_IO_EXTENT); 116 116 return -ENODEV;
+251 -249
drivers/net/tokenring/smctr.c
··· 435 435 RX_DATA_BUFFER_SIZE * tp->num_rx_bdbs[NON_MAC_QUEUE]); 436 436 tp->rx_buff_end[NON_MAC_QUEUE] = (__u16 *)smctr_malloc(dev, 0); 437 437 438 - return (0); 438 + return 0; 439 439 } 440 440 441 441 /* Enter Bypass state. */ ··· 448 448 449 449 err = smctr_setup_single_cmd(dev, ACB_CMD_CHANGE_JOIN_STATE, JS_BYPASS_STATE); 450 450 451 - return (err); 451 + return err; 452 452 } 453 453 454 454 static int smctr_checksum_firmware(struct net_device *dev) ··· 471 471 smctr_disable_adapter_ctrl_store(dev); 472 472 473 473 if(checksum) 474 - return (checksum); 474 + return checksum; 475 475 476 - return (0); 476 + return 0; 477 477 } 478 478 479 479 static int __init smctr_chk_mca(struct net_device *dev) ··· 485 485 486 486 current_slot = mca_find_unused_adapter(smctr_posid, 0); 487 487 if(current_slot == MCA_NOTFOUND) 488 - return (-ENODEV); 488 + return -ENODEV; 489 489 490 490 mca_set_adapter_name(current_slot, smctr_name); 491 491 mca_mark_as_used(current_slot); ··· 622 622 break; 623 623 } 624 624 625 - return (0); 625 + return 0; 626 626 #else 627 - return (-1); 627 + return -1; 628 628 #endif /* CONFIG_MCA_LEGACY */ 629 629 } 630 630 ··· 677 677 if((err = smctr_issue_write_word_cmd(dev, RW_CONFIG_REGISTER_0, 678 678 &tp->config_word0))) 679 679 { 680 - return (err); 680 + return err; 681 681 } 682 682 683 683 if((err = smctr_issue_write_word_cmd(dev, RW_CONFIG_REGISTER_1, 684 684 &tp->config_word1))) 685 685 { 686 - return (err); 686 + return err; 687 687 } 688 688 689 689 smctr_disable_16bit(dev); 690 690 691 - return (0); 691 + return 0; 692 692 } 693 693 694 694 static int smctr_clear_int(struct net_device *dev) ··· 697 697 698 698 outb((tp->trc_mask | CSR_CLRTINT), dev->base_addr + CSR); 699 699 700 - return (0); 700 + return 0; 701 701 } 702 702 703 703 static int smctr_clear_trc_reset(int ioaddr) ··· 707 707 r = inb(ioaddr + MSR); 708 708 outb(~MSR_RST & r, ioaddr + MSR); 709 709 710 - return (0); 710 + return 0; 711 711 } 712 712 713 713 /* ··· 725 725 726 726 /* Check to see if adapter is already in a closed state. */ 727 727 if(tp->status != OPEN) 728 - return (0); 728 + return 0; 729 729 730 730 smctr_enable_16bit(dev); 731 731 smctr_set_page(dev, (__u8 *)tp->ram_access); ··· 733 733 if((err = smctr_issue_remove_cmd(dev))) 734 734 { 735 735 smctr_disable_16bit(dev); 736 - return (err); 736 + return err; 737 737 } 738 738 739 739 for(;;) ··· 746 746 } 747 747 748 748 749 - return (0); 749 + return 0; 750 750 } 751 751 752 752 static int smctr_decode_firmware(struct net_device *dev, ··· 807 807 if(buff) 808 808 *(mem++) = SWAP_BYTES(buff); 809 809 810 - return (0); 810 + return 0; 811 811 } 812 812 813 813 static int smctr_disable_16bit(struct net_device *dev) 814 814 { 815 - return (0); 815 + return 0; 816 816 } 817 817 818 818 /* ··· 832 832 tp->trc_mask |= CSR_WCSS; 833 833 outb(tp->trc_mask, ioaddr + CSR); 834 834 835 - return (0); 835 + return 0; 836 836 } 837 837 838 838 static int smctr_disable_bic_int(struct net_device *dev) ··· 844 844 | CSR_MSKTINT | CSR_WCSS; 845 845 outb(tp->trc_mask, ioaddr + CSR); 846 846 847 - return (0); 847 + return 0; 848 848 } 849 849 850 850 static int smctr_enable_16bit(struct net_device *dev) ··· 858 858 outb((r | LAAR_MEM16ENB), dev->base_addr + LAAR); 859 859 } 860 860 861 - return (0); 861 + return 0; 862 862 } 863 863 864 864 /* ··· 881 881 tp->trc_mask &= ~CSR_WCSS; 882 882 outb(tp->trc_mask, ioaddr + CSR); 883 883 884 - return (0); 884 + return 0; 885 885 } 886 886 887 887 static int smctr_enable_adapter_ram(struct net_device *dev) ··· 895 895 r = inb(ioaddr + MSR); 896 896 outb(MSR_MEMB | r, ioaddr + MSR); 897 897 898 - return (0); 898 + return 0; 899 899 } 900 900 901 901 static int smctr_enable_bic_int(struct net_device *dev) ··· 921 921 break; 922 922 } 923 923 924 - return (0); 924 + return 0; 925 925 } 926 926 927 927 static int __init smctr_chk_isa(struct net_device *dev) ··· 1145 1145 */ 1146 1146 } 1147 1147 1148 - return (0); 1148 + return 0; 1149 1149 1150 1150 out2: 1151 1151 release_region(ioaddr, SMCTR_IO_EXTENT); ··· 1199 1199 * return; 1200 1200 */ 1201 1201 if(IdByte & 0xF8) 1202 - return (-1); 1202 + return -1; 1203 1203 1204 1204 r1 = inb(ioaddr + BID_REG_1); 1205 1205 r1 &= BID_ICR_MASK; ··· 1250 1250 while(r1 & BID_RECALL_DONE_MASK) 1251 1251 r1 = inb(ioaddr + BID_REG_1); 1252 1252 1253 - return (BoardIdMask); 1253 + return BoardIdMask; 1254 1254 } 1255 1255 1256 1256 static int smctr_get_group_address(struct net_device *dev) 1257 1257 { 1258 1258 smctr_issue_read_word_cmd(dev, RW_INDIVIDUAL_GROUP_ADDR); 1259 1259 1260 - return(smctr_wait_cmd(dev)); 1260 + return smctr_wait_cmd(dev); 1261 1261 } 1262 1262 1263 1263 static int smctr_get_functional_address(struct net_device *dev) 1264 1264 { 1265 1265 smctr_issue_read_word_cmd(dev, RW_FUNCTIONAL_ADDR); 1266 1266 1267 - return(smctr_wait_cmd(dev)); 1267 + return smctr_wait_cmd(dev); 1268 1268 } 1269 1269 1270 1270 /* Calculate number of Non-MAC receive BDB's and data buffers. ··· 1346 1346 */ 1347 1347 mem_used += 0x100; 1348 1348 1349 - return((0xffff - mem_used) / (RX_DATA_BUFFER_SIZE + sizeof(BDBlock))); 1349 + return (0xffff - mem_used) / (RX_DATA_BUFFER_SIZE + sizeof(BDBlock)); 1350 1350 } 1351 1351 1352 1352 static int smctr_get_physical_drop_number(struct net_device *dev) 1353 1353 { 1354 1354 smctr_issue_read_word_cmd(dev, RW_PHYSICAL_DROP_NUMBER); 1355 1355 1356 - return(smctr_wait_cmd(dev)); 1356 + return smctr_wait_cmd(dev); 1357 1357 } 1358 1358 1359 1359 static __u8 * smctr_get_rx_pointer(struct net_device *dev, short queue) ··· 1366 1366 1367 1367 tp->rx_fcb_curr[queue]->bdb_ptr = bdb; 1368 1368 1369 - return ((__u8 *)bdb->data_block_ptr); 1369 + return (__u8 *)bdb->data_block_ptr; 1370 1370 } 1371 1371 1372 1372 static int smctr_get_station_id(struct net_device *dev) 1373 1373 { 1374 1374 smctr_issue_read_word_cmd(dev, RW_INDIVIDUAL_MAC_ADDRESS); 1375 1375 1376 - return(smctr_wait_cmd(dev)); 1376 + return smctr_wait_cmd(dev); 1377 1377 } 1378 1378 1379 1379 /* ··· 1384 1384 { 1385 1385 struct net_local *tp = netdev_priv(dev); 1386 1386 1387 - return ((struct net_device_stats *)&tp->MacStat); 1387 + return (struct net_device_stats *)&tp->MacStat; 1388 1388 } 1389 1389 1390 1390 static FCBlock *smctr_get_tx_fcb(struct net_device *dev, __u16 queue, ··· 1401 1401 1402 1402 /* check if there is enough FCB blocks */ 1403 1403 if(tp->num_tx_fcbs_used[queue] >= tp->num_tx_fcbs[queue]) 1404 - return ((FCBlock *)(-1L)); 1404 + return (FCBlock *)(-1L); 1405 1405 1406 1406 /* round off the input pkt size to the nearest even number */ 1407 1407 alloc_size = (bytes_count + 1) & 0xfffe; 1408 1408 1409 1409 /* check if enough mem */ 1410 1410 if((tp->tx_buff_used[queue] + alloc_size) > tp->tx_buff_size[queue]) 1411 - return ((FCBlock *)(-1L)); 1411 + return (FCBlock *)(-1L); 1412 1412 1413 1413 /* check if past the end ; 1414 1414 * if exactly enough mem to end of ring, alloc from front. ··· 1425 1425 if((tp->tx_buff_used[queue] + alloc_size) 1426 1426 > tp->tx_buff_size[queue]) 1427 1427 { 1428 - return ((FCBlock *)(-1L)); 1428 + return (FCBlock *)(-1L); 1429 1429 } 1430 1430 1431 1431 /* ring wrap */ ··· 1448 1448 pFCB = tp->tx_fcb_curr[queue]; 1449 1449 tp->tx_fcb_curr[queue] = tp->tx_fcb_curr[queue]->next_ptr; 1450 1450 1451 - return (pFCB); 1451 + return pFCB; 1452 1452 } 1453 1453 1454 1454 static int smctr_get_upstream_neighbor_addr(struct net_device *dev) 1455 1455 { 1456 1456 smctr_issue_read_word_cmd(dev, RW_UPSTREAM_NEIGHBOR_ADDRESS); 1457 1457 1458 - return(smctr_wait_cmd(dev)); 1458 + return smctr_wait_cmd(dev); 1459 1459 } 1460 1460 1461 1461 static int smctr_hardware_send_packet(struct net_device *dev, ··· 1469 1469 printk(KERN_DEBUG"%s: smctr_hardware_send_packet\n", dev->name); 1470 1470 1471 1471 if(tp->status != OPEN) 1472 - return (-1); 1472 + return -1; 1473 1473 1474 1474 if(tp->monitor_state_ready != 1) 1475 - return (-1); 1475 + return -1; 1476 1476 1477 1477 for(;;) 1478 1478 { 1479 1479 /* Send first buffer from queue */ 1480 1480 skb = skb_dequeue(&tp->SendSkbQueue); 1481 1481 if(skb == NULL) 1482 - return (-1); 1482 + return -1; 1483 1483 1484 1484 tp->QueueSkb++; 1485 1485 1486 - if(skb->len < SMC_HEADER_SIZE || skb->len > tp->max_packet_size) return (-1); 1486 + if(skb->len < SMC_HEADER_SIZE || skb->len > tp->max_packet_size) 1487 + return -1; 1487 1488 1488 1489 smctr_enable_16bit(dev); 1489 1490 smctr_set_page(dev, (__u8 *)tp->ram_access); ··· 1493 1492 == (FCBlock *)(-1L)) 1494 1493 { 1495 1494 smctr_disable_16bit(dev); 1496 - return (-1); 1495 + return -1; 1497 1496 } 1498 1497 1499 1498 smctr_tx_move_frame(dev, skb, ··· 1509 1508 smctr_disable_16bit(dev); 1510 1509 } 1511 1510 1512 - return (0); 1511 + return 0; 1513 1512 } 1514 1513 1515 1514 static int smctr_init_acbs(struct net_device *dev) ··· 1553 1552 tp->acb_curr = tp->acb_head->next_ptr; 1554 1553 tp->num_acbs_used = 0; 1555 1554 1556 - return (0); 1555 + return 0; 1557 1556 } 1558 1557 1559 1558 static int smctr_init_adapter(struct net_device *dev) ··· 1591 1590 1592 1591 if(smctr_checksum_firmware(dev)) 1593 1592 { 1594 - printk(KERN_ERR "%s: Previously loaded firmware is missing\n",dev->name); return (-ENOENT); 1593 + printk(KERN_ERR "%s: Previously loaded firmware is missing\n",dev->name); 1594 + return -ENOENT; 1595 1595 } 1596 1596 1597 1597 if((err = smctr_ram_memory_test(dev))) 1598 1598 { 1599 1599 printk(KERN_ERR "%s: RAM memory test failed.\n", dev->name); 1600 - return (-EIO); 1600 + return -EIO; 1601 1601 } 1602 1602 1603 1603 smctr_set_rx_look_ahead(dev); ··· 1610 1608 { 1611 1609 printk(KERN_ERR "%s: Initialization of card failed (%d)\n", 1612 1610 dev->name, err); 1613 - return (-EINVAL); 1611 + return -EINVAL; 1614 1612 } 1615 1613 1616 1614 /* This routine clobbers the TRC's internal registers. */ ··· 1618 1616 { 1619 1617 printk(KERN_ERR "%s: Card failed internal self test (%d)\n", 1620 1618 dev->name, err); 1621 - return (-EINVAL); 1619 + return -EINVAL; 1622 1620 } 1623 1621 1624 1622 /* Re-Initialize adapter's internal registers */ ··· 1627 1625 { 1628 1626 printk(KERN_ERR "%s: Initialization of card failed (%d)\n", 1629 1627 dev->name, err); 1630 - return (-EINVAL); 1628 + return -EINVAL; 1631 1629 } 1632 1630 1633 1631 smctr_enable_bic_int(dev); 1634 1632 1635 1633 if((err = smctr_issue_enable_int_cmd(dev, TRC_INTERRUPT_ENABLE_MASK))) 1636 - return (err); 1634 + return err; 1637 1635 1638 1636 smctr_disable_16bit(dev); 1639 1637 1640 - return (0); 1638 + return 0; 1641 1639 } 1642 1640 1643 1641 static int smctr_init_card_real(struct net_device *dev) ··· 1705 1703 smctr_init_shared_memory(dev); 1706 1704 1707 1705 if((err = smctr_issue_init_timers_cmd(dev))) 1708 - return (err); 1706 + return err; 1709 1707 1710 1708 if((err = smctr_issue_init_txrx_cmd(dev))) 1711 1709 { 1712 1710 printk(KERN_ERR "%s: Hardware failure\n", dev->name); 1713 - return (err); 1711 + return err; 1714 1712 } 1715 1713 1716 - return (0); 1714 + return 0; 1717 1715 } 1718 1716 1719 1717 static int smctr_init_rx_bdbs(struct net_device *dev) ··· 1765 1763 tp->rx_bdb_curr[i] = tp->rx_bdb_head[i]->next_ptr; 1766 1764 } 1767 1765 1768 - return (0); 1766 + return 0; 1769 1767 } 1770 1768 1771 1769 static int smctr_init_rx_fcbs(struct net_device *dev) ··· 1815 1813 tp->rx_fcb_curr[i] = tp->rx_fcb_head[i]->next_ptr; 1816 1814 } 1817 1815 1818 - return(0); 1816 + return 0; 1819 1817 } 1820 1818 1821 1819 static int smctr_init_shared_memory(struct net_device *dev) ··· 1873 1871 smctr_init_rx_bdbs(dev); 1874 1872 smctr_init_rx_fcbs(dev); 1875 1873 1876 - return (0); 1874 + return 0; 1877 1875 } 1878 1876 1879 1877 static int smctr_init_tx_bdbs(struct net_device *dev) ··· 1903 1901 tp->tx_bdb_head[i]->back_ptr = bdb; 1904 1902 } 1905 1903 1906 - return (0); 1904 + return 0; 1907 1905 } 1908 1906 1909 1907 static int smctr_init_tx_fcbs(struct net_device *dev) ··· 1942 1940 tp->num_tx_fcbs_used[i] = 0; 1943 1941 } 1944 1942 1945 - return (0); 1943 + return 0; 1946 1944 } 1947 1945 1948 1946 static int smctr_internal_self_test(struct net_device *dev) ··· 1951 1949 int err; 1952 1950 1953 1951 if((err = smctr_issue_test_internal_rom_cmd(dev))) 1954 - return (err); 1952 + return err; 1955 1953 1956 1954 if((err = smctr_wait_cmd(dev))) 1957 - return (err); 1955 + return err; 1958 1956 1959 1957 if(tp->acb_head->cmd_done_status & 0xff) 1960 - return (-1); 1958 + return -1; 1961 1959 1962 1960 if((err = smctr_issue_test_hic_cmd(dev))) 1963 - return (err); 1961 + return err; 1964 1962 1965 1963 if((err = smctr_wait_cmd(dev))) 1966 - return (err); 1964 + return err; 1967 1965 1968 1966 if(tp->acb_head->cmd_done_status & 0xff) 1969 - return (-1); 1967 + return -1; 1970 1968 1971 1969 if((err = smctr_issue_test_mac_reg_cmd(dev))) 1972 - return (err); 1970 + return err; 1973 1971 1974 1972 if((err = smctr_wait_cmd(dev))) 1975 - return (err); 1973 + return err; 1976 1974 1977 1975 if(tp->acb_head->cmd_done_status & 0xff) 1978 - return (-1); 1976 + return -1; 1979 1977 1980 - return (0); 1978 + return 0; 1981 1979 } 1982 1980 1983 1981 /* ··· 2470 2468 int err; 2471 2469 2472 2470 if((err = smctr_wait_while_cbusy(dev))) 2473 - return (err); 2471 + return err; 2474 2472 2475 2473 tp->sclb_ptr->int_mask_control = interrupt_enable_mask; 2476 2474 tp->sclb_ptr->valid_command = SCLB_VALID | SCLB_CMD_CLEAR_INTERRUPT_MASK; 2477 2475 2478 2476 smctr_set_ctrl_attention(dev); 2479 2477 2480 - return (0); 2478 + return 0; 2481 2479 } 2482 2480 2483 2481 static int smctr_issue_int_ack(struct net_device *dev, __u16 iack_code, __u16 ibits) ··· 2485 2483 struct net_local *tp = netdev_priv(dev); 2486 2484 2487 2485 if(smctr_wait_while_cbusy(dev)) 2488 - return (-1); 2486 + return -1; 2489 2487 2490 2488 tp->sclb_ptr->int_mask_control = ibits; 2491 2489 tp->sclb_ptr->iack_code = iack_code << 1; /* use the offset from base */ tp->sclb_ptr->resume_control = 0; ··· 2493 2491 2494 2492 smctr_set_ctrl_attention(dev); 2495 2493 2496 - return (0); 2494 + return 0; 2497 2495 } 2498 2496 2499 2497 static int smctr_issue_init_timers_cmd(struct net_device *dev) ··· 2504 2502 __u16 *pTimer_Struc = (__u16 *)tp->misc_command_data; 2505 2503 2506 2504 if((err = smctr_wait_while_cbusy(dev))) 2507 - return (err); 2505 + return err; 2508 2506 2509 2507 if((err = smctr_wait_cmd(dev))) 2510 - return (err); 2508 + return err; 2511 2509 2512 2510 tp->config_word0 = THDREN | DMA_TRIGGER | USETPT | NO_AUTOREMOVE; 2513 2511 tp->config_word1 = 0; ··· 2650 2648 2651 2649 err = smctr_setup_single_cmd_w_data(dev, ACB_CMD_INIT_TRC_TIMERS, 0); 2652 2650 2653 - return (err); 2651 + return err; 2654 2652 } 2655 2653 2656 2654 static int smctr_issue_init_txrx_cmd(struct net_device *dev) ··· 2661 2659 void **txrx_ptrs = (void *)tp->misc_command_data; 2662 2660 2663 2661 if((err = smctr_wait_while_cbusy(dev))) 2664 - return (err); 2662 + return err; 2665 2663 2666 2664 if((err = smctr_wait_cmd(dev))) 2667 2665 { 2668 2666 printk(KERN_ERR "%s: Hardware failure\n", dev->name); 2669 - return (err); 2667 + return err; 2670 2668 } 2671 2669 2672 2670 /* Initialize Transmit Queue Pointers that are used, to point to ··· 2697 2695 2698 2696 err = smctr_setup_single_cmd_w_data(dev, ACB_CMD_INIT_TX_RX, 0); 2699 2697 2700 - return (err); 2698 + return err; 2701 2699 } 2702 2700 2703 2701 static int smctr_issue_insert_cmd(struct net_device *dev) ··· 2706 2704 2707 2705 err = smctr_setup_single_cmd(dev, ACB_CMD_INSERT, ACB_SUB_CMD_NOP); 2708 2706 2709 - return (err); 2707 + return err; 2710 2708 } 2711 2709 2712 2710 static int smctr_issue_read_ring_status_cmd(struct net_device *dev) ··· 2714 2712 int err; 2715 2713 2716 2714 if((err = smctr_wait_while_cbusy(dev))) 2717 - return (err); 2715 + return err; 2718 2716 2719 2717 if((err = smctr_wait_cmd(dev))) 2720 - return (err); 2718 + return err; 2721 2719 2722 2720 err = smctr_setup_single_cmd_w_data(dev, ACB_CMD_READ_TRC_STATUS, 2723 2721 RW_TRC_STATUS_BLOCK); 2724 2722 2725 - return (err); 2723 + return err; 2726 2724 } 2727 2725 2728 2726 static int smctr_issue_read_word_cmd(struct net_device *dev, __u16 aword_cnt) ··· 2730 2728 int err; 2731 2729 2732 2730 if((err = smctr_wait_while_cbusy(dev))) 2733 - return (err); 2731 + return err; 2734 2732 2735 2733 if((err = smctr_wait_cmd(dev))) 2736 - return (err); 2734 + return err; 2737 2735 2738 2736 err = smctr_setup_single_cmd_w_data(dev, ACB_CMD_MCT_READ_VALUE, 2739 2737 aword_cnt); 2740 2738 2741 - return (err); 2739 + return err; 2742 2740 } 2743 2741 2744 2742 static int smctr_issue_remove_cmd(struct net_device *dev) ··· 2747 2745 int err; 2748 2746 2749 2747 if((err = smctr_wait_while_cbusy(dev))) 2750 - return (err); 2748 + return err; 2751 2749 2752 2750 tp->sclb_ptr->resume_control = 0; 2753 2751 tp->sclb_ptr->valid_command = SCLB_VALID | SCLB_CMD_REMOVE; 2754 2752 2755 2753 smctr_set_ctrl_attention(dev); 2756 2754 2757 - return (0); 2755 + return 0; 2758 2756 } 2759 2757 2760 2758 static int smctr_issue_resume_acb_cmd(struct net_device *dev) ··· 2763 2761 int err; 2764 2762 2765 2763 if((err = smctr_wait_while_cbusy(dev))) 2766 - return (err); 2764 + return err; 2767 2765 2768 2766 tp->sclb_ptr->resume_control = SCLB_RC_ACB; 2769 2767 tp->sclb_ptr->valid_command = SCLB_VALID | SCLB_RESUME_CONTROL_VALID; ··· 2772 2770 2773 2771 smctr_set_ctrl_attention(dev); 2774 2772 2775 - return (0); 2773 + return 0; 2776 2774 } 2777 2775 2778 2776 static int smctr_issue_resume_rx_bdb_cmd(struct net_device *dev, __u16 queue) ··· 2781 2779 int err; 2782 2780 2783 2781 if((err = smctr_wait_while_cbusy(dev))) 2784 - return (err); 2782 + return err; 2785 2783 2786 2784 if(queue == MAC_QUEUE) 2787 2785 tp->sclb_ptr->resume_control = SCLB_RC_RX_MAC_BDB; ··· 2792 2790 2793 2791 smctr_set_ctrl_attention(dev); 2794 2792 2795 - return (0); 2793 + return 0; 2796 2794 } 2797 2795 2798 2796 static int smctr_issue_resume_rx_fcb_cmd(struct net_device *dev, __u16 queue) ··· 2803 2801 printk(KERN_DEBUG "%s: smctr_issue_resume_rx_fcb_cmd\n", dev->name); 2804 2802 2805 2803 if(smctr_wait_while_cbusy(dev)) 2806 - return (-1); 2804 + return -1; 2807 2805 2808 2806 if(queue == MAC_QUEUE) 2809 2807 tp->sclb_ptr->resume_control = SCLB_RC_RX_MAC_FCB; ··· 2814 2812 2815 2813 smctr_set_ctrl_attention(dev); 2816 2814 2817 - return (0); 2815 + return 0; 2818 2816 } 2819 2817 2820 2818 static int smctr_issue_resume_tx_fcb_cmd(struct net_device *dev, __u16 queue) ··· 2825 2823 printk(KERN_DEBUG "%s: smctr_issue_resume_tx_fcb_cmd\n", dev->name); 2826 2824 2827 2825 if(smctr_wait_while_cbusy(dev)) 2828 - return (-1); 2826 + return -1; 2829 2827 2830 2828 tp->sclb_ptr->resume_control = (SCLB_RC_TFCB0 << queue); 2831 2829 tp->sclb_ptr->valid_command = SCLB_RESUME_CONTROL_VALID | SCLB_VALID; 2832 2830 2833 2831 smctr_set_ctrl_attention(dev); 2834 2832 2835 - return (0); 2833 + return 0; 2836 2834 } 2837 2835 2838 2836 static int smctr_issue_test_internal_rom_cmd(struct net_device *dev) ··· 2842 2840 err = smctr_setup_single_cmd(dev, ACB_CMD_MCT_TEST, 2843 2841 TRC_INTERNAL_ROM_TEST); 2844 2842 2845 - return (err); 2843 + return err; 2846 2844 } 2847 2845 2848 2846 static int smctr_issue_test_hic_cmd(struct net_device *dev) ··· 2852 2850 err = smctr_setup_single_cmd(dev, ACB_CMD_HIC_TEST, 2853 2851 TRC_HOST_INTERFACE_REG_TEST); 2854 2852 2855 - return (err); 2853 + return err; 2856 2854 } 2857 2855 2858 2856 static int smctr_issue_test_mac_reg_cmd(struct net_device *dev) ··· 2862 2860 err = smctr_setup_single_cmd(dev, ACB_CMD_MCT_TEST, 2863 2861 TRC_MAC_REGISTERS_TEST); 2864 2862 2865 - return (err); 2863 + return err; 2866 2864 } 2867 2865 2868 2866 static int smctr_issue_trc_loopback_cmd(struct net_device *dev) ··· 2872 2870 err = smctr_setup_single_cmd(dev, ACB_CMD_MCT_TEST, 2873 2871 TRC_INTERNAL_LOOPBACK); 2874 2872 2875 - return (err); 2873 + return err; 2876 2874 } 2877 2875 2878 2876 static int smctr_issue_tri_loopback_cmd(struct net_device *dev) ··· 2882 2880 err = smctr_setup_single_cmd(dev, ACB_CMD_MCT_TEST, 2883 2881 TRC_TRI_LOOPBACK); 2884 2882 2885 - return (err); 2883 + return err; 2886 2884 } 2887 2885 2888 2886 static int smctr_issue_write_byte_cmd(struct net_device *dev, ··· 2893 2891 int err; 2894 2892 2895 2893 if((err = smctr_wait_while_cbusy(dev))) 2896 - return (err); 2894 + return err; 2897 2895 2898 2896 if((err = smctr_wait_cmd(dev))) 2899 - return (err); 2897 + return err; 2900 2898 2901 2899 for(iword = 0, ibyte = 0; iword < (unsigned int)(aword_cnt & 0xff); 2902 2900 iword++, ibyte += 2) ··· 2905 2903 | (*((__u8 *)byte + ibyte + 1)); 2906 2904 } 2907 2905 2908 - return (smctr_setup_single_cmd_w_data(dev, ACB_CMD_MCT_WRITE_VALUE, 2909 - aword_cnt)); 2906 + return smctr_setup_single_cmd_w_data(dev, ACB_CMD_MCT_WRITE_VALUE, 2907 + aword_cnt); 2910 2908 } 2911 2909 2912 2910 static int smctr_issue_write_word_cmd(struct net_device *dev, ··· 2916 2914 unsigned int i, err; 2917 2915 2918 2916 if((err = smctr_wait_while_cbusy(dev))) 2919 - return (err); 2917 + return err; 2920 2918 2921 2919 if((err = smctr_wait_cmd(dev))) 2922 - return (err); 2920 + return err; 2923 2921 2924 2922 for(i = 0; i < (unsigned int)(aword_cnt & 0xff); i++) 2925 2923 tp->misc_command_data[i] = *((__u16 *)word + i); ··· 2927 2925 err = smctr_setup_single_cmd_w_data(dev, ACB_CMD_MCT_WRITE_VALUE, 2928 2926 aword_cnt); 2929 2927 2930 - return (err); 2928 + return err; 2931 2929 } 2932 2930 2933 2931 static int smctr_join_complete_state(struct net_device *dev) ··· 2937 2935 err = smctr_setup_single_cmd(dev, ACB_CMD_CHANGE_JOIN_STATE, 2938 2936 JS_JOIN_COMPLETE_STATE); 2939 2937 2940 - return (err); 2938 + return err; 2941 2939 } 2942 2940 2943 2941 static int smctr_link_tx_fcbs_to_bdbs(struct net_device *dev) ··· 2961 2959 } 2962 2960 } 2963 2961 2964 - return (0); 2962 + return 0; 2965 2963 } 2966 2964 2967 2965 static int smctr_load_firmware(struct net_device *dev) ··· 2976 2974 2977 2975 if (request_firmware(&fw, "tr_smctr.bin", &dev->dev)) { 2978 2976 printk(KERN_ERR "%s: firmware not found\n", dev->name); 2979 - return (UCODE_NOT_PRESENT); 2977 + return UCODE_NOT_PRESENT; 2980 2978 } 2981 2979 2982 2980 tp->num_of_tx_buffs = 4; ··· 3038 3036 smctr_disable_16bit(dev); 3039 3037 out: 3040 3038 release_firmware(fw); 3041 - return (err); 3039 + return err; 3042 3040 } 3043 3041 3044 3042 static int smctr_load_node_addr(struct net_device *dev) ··· 3054 3052 } 3055 3053 dev->addr_len = 6; 3056 3054 3057 - return (0); 3055 + return 0; 3058 3056 } 3059 3057 3060 3058 /* Lobe Media Test. ··· 3148 3146 if(smctr_wait_cmd(dev)) 3149 3147 { 3150 3148 printk(KERN_ERR "Lobe Failed test state\n"); 3151 - return (LOBE_MEDIA_TEST_FAILED); 3149 + return LOBE_MEDIA_TEST_FAILED; 3152 3150 } 3153 3151 } 3154 3152 3155 3153 err = smctr_setup_single_cmd(dev, ACB_CMD_MCT_TEST, 3156 3154 TRC_LOBE_MEDIA_TEST); 3157 3155 3158 - return (err); 3156 + return err; 3159 3157 } 3160 3158 3161 3159 static int smctr_lobe_media_test_state(struct net_device *dev) ··· 3165 3163 err = smctr_setup_single_cmd(dev, ACB_CMD_CHANGE_JOIN_STATE, 3166 3164 JS_LOBE_TEST_STATE); 3167 3165 3168 - return (err); 3166 + return err; 3169 3167 } 3170 3168 3171 3169 static int smctr_make_8025_hdr(struct net_device *dev, ··· 3214 3212 break; 3215 3213 } 3216 3214 3217 - return (0); 3215 + return 0; 3218 3216 } 3219 3217 3220 3218 static int smctr_make_access_pri(struct net_device *dev, MAC_SUB_VECTOR *tsv) ··· 3227 3225 tsv->svv[0] = MSB(tp->authorized_access_priority); 3228 3226 tsv->svv[1] = LSB(tp->authorized_access_priority); 3229 3227 3230 - return (0); 3228 + return 0; 3231 3229 } 3232 3230 3233 3231 static int smctr_make_addr_mod(struct net_device *dev, MAC_SUB_VECTOR *tsv) ··· 3238 3236 tsv->svv[0] = 0; 3239 3237 tsv->svv[1] = 0; 3240 3238 3241 - return (0); 3239 + return 0; 3242 3240 } 3243 3241 3244 3242 static int smctr_make_auth_funct_class(struct net_device *dev, ··· 3252 3250 tsv->svv[0] = MSB(tp->authorized_function_classes); 3253 3251 tsv->svv[1] = LSB(tp->authorized_function_classes); 3254 3252 3255 - return (0); 3253 + return 0; 3256 3254 } 3257 3255 3258 3256 static int smctr_make_corr(struct net_device *dev, ··· 3264 3262 tsv->svv[0] = MSB(correlator); 3265 3263 tsv->svv[1] = LSB(correlator); 3266 3264 3267 - return (0); 3265 + return 0; 3268 3266 } 3269 3267 3270 3268 static int smctr_make_funct_addr(struct net_device *dev, MAC_SUB_VECTOR *tsv) ··· 3282 3280 tsv->svv[2] = MSB(tp->misc_command_data[1]); 3283 3281 tsv->svv[3] = LSB(tp->misc_command_data[1]); 3284 3282 3285 - return (0); 3283 + return 0; 3286 3284 } 3287 3285 3288 3286 static int smctr_make_group_addr(struct net_device *dev, MAC_SUB_VECTOR *tsv) ··· 3307 3305 tsv->svv[2] == 0x00 && tsv->svv[3] == 0x00) 3308 3306 tsv->svv[0] = 0x00; 3309 3307 3310 - return (0); 3308 + return 0; 3311 3309 } 3312 3310 3313 3311 static int smctr_make_phy_drop_num(struct net_device *dev, ··· 3326 3324 tsv->svv[2] = MSB(tp->misc_command_data[1]); 3327 3325 tsv->svv[3] = LSB(tp->misc_command_data[1]); 3328 3326 3329 - return (0); 3327 + return 0; 3330 3328 } 3331 3329 3332 3330 static int smctr_make_product_id(struct net_device *dev, MAC_SUB_VECTOR *tsv) ··· 3339 3337 for(i = 0; i < 18; i++) 3340 3338 tsv->svv[i] = 0xF0; 3341 3339 3342 - return (0); 3340 + return 0; 3343 3341 } 3344 3342 3345 3343 static int smctr_make_station_id(struct net_device *dev, MAC_SUB_VECTOR *tsv) ··· 3360 3358 tsv->svv[4] = MSB(tp->misc_command_data[2]); 3361 3359 tsv->svv[5] = LSB(tp->misc_command_data[2]); 3362 3360 3363 - return (0); 3361 + return 0; 3364 3362 } 3365 3363 3366 3364 static int smctr_make_ring_station_status(struct net_device *dev, ··· 3376 3374 tsv->svv[4] = 0; 3377 3375 tsv->svv[5] = 0; 3378 3376 3379 - return (0); 3377 + return 0; 3380 3378 } 3381 3379 3382 3380 static int smctr_make_ring_station_version(struct net_device *dev, ··· 3402 3400 else 3403 3401 tsv->svv[9] = 0xc4; /* EBCDIC - D */ 3404 3402 3405 - return (0); 3403 + return 0; 3406 3404 } 3407 3405 3408 3406 static int smctr_make_tx_status_code(struct net_device *dev, ··· 3416 3414 /* Stripped frame status of Transmitted Frame */ 3417 3415 tsv->svv[1] = tx_fstatus & 0xff; 3418 3416 3419 - return (0); 3417 + return 0; 3420 3418 } 3421 3419 3422 3420 static int smctr_make_upstream_neighbor_addr(struct net_device *dev, ··· 3438 3436 tsv->svv[4] = MSB(tp->misc_command_data[2]); 3439 3437 tsv->svv[5] = LSB(tp->misc_command_data[2]); 3440 3438 3441 - return (0); 3439 + return 0; 3442 3440 } 3443 3441 3444 3442 static int smctr_make_wrap_data(struct net_device *dev, MAC_SUB_VECTOR *tsv) ··· 3446 3444 tsv->svi = WRAP_DATA; 3447 3445 tsv->svl = S_WRAP_DATA; 3448 3446 3449 - return (0); 3447 + return 0; 3450 3448 } 3451 3449 3452 3450 /* ··· 3466 3464 3467 3465 err = smctr_init_adapter(dev); 3468 3466 if(err < 0) 3469 - return (err); 3467 + return err; 3470 3468 3471 - return (err); 3469 + return err; 3472 3470 } 3473 3471 3474 3472 /* Interrupt driven open of Token card. */ ··· 3483 3481 3484 3482 /* Now we can actually open the adapter. */ 3485 3483 if(tp->status == OPEN) 3486 - return (0); 3484 + return 0; 3487 3485 if(tp->status != INITIALIZED) 3488 - return (-1); 3486 + return -1; 3489 3487 3490 3488 /* FIXME: it would work a lot better if we masked the irq sources 3491 3489 on the card here, then we could skip the locking and poll nicely */ ··· 3562 3560 out: 3563 3561 spin_unlock_irqrestore(&tp->lock, flags); 3564 3562 3565 - return (err); 3563 + return err; 3566 3564 } 3567 3565 3568 3566 /* Check for a network adapter of this type, ··· 3677 3675 3678 3676 dev->netdev_ops = &smctr_netdev_ops; 3679 3677 dev->watchdog_timeo = HZ; 3680 - return (0); 3678 + return 0; 3681 3679 3682 3680 out: 3683 3681 return err; ··· 3701 3699 case INIT: 3702 3700 if((rcode = smctr_rcv_init(dev, rmf, &correlator)) == HARDWARE_FAILED) 3703 3701 { 3704 - return (rcode); 3702 + return rcode; 3705 3703 } 3706 3704 3707 3705 if((err = smctr_send_rsp(dev, rmf, rcode, 3708 3706 correlator))) 3709 3707 { 3710 - return (err); 3708 + return err; 3711 3709 } 3712 3710 break; 3713 3711 ··· 3715 3713 if((rcode = smctr_rcv_chg_param(dev, rmf, 3716 3714 &correlator)) ==HARDWARE_FAILED) 3717 3715 { 3718 - return (rcode); 3716 + return rcode; 3719 3717 } 3720 3718 3721 3719 if((err = smctr_send_rsp(dev, rmf, rcode, 3722 3720 correlator))) 3723 3721 { 3724 - return (err); 3722 + return err; 3725 3723 } 3726 3724 break; 3727 3725 ··· 3730 3728 rmf, &correlator)) != POSITIVE_ACK) 3731 3729 { 3732 3730 if(rcode == HARDWARE_FAILED) 3733 - return (rcode); 3731 + return rcode; 3734 3732 else 3735 - return (smctr_send_rsp(dev, rmf, 3736 - rcode, correlator)); 3733 + return smctr_send_rsp(dev, rmf, 3734 + rcode, correlator); 3737 3735 } 3738 3736 3739 3737 if((err = smctr_send_rpt_addr(dev, rmf, 3740 3738 correlator))) 3741 3739 { 3742 - return (err); 3740 + return err; 3743 3741 } 3744 3742 break; 3745 3743 ··· 3748 3746 rmf, &correlator)) != POSITIVE_ACK) 3749 3747 { 3750 3748 if(rcode == HARDWARE_FAILED) 3751 - return (rcode); 3749 + return rcode; 3752 3750 else 3753 - return (smctr_send_rsp(dev, rmf, 3751 + return smctr_send_rsp(dev, rmf, 3754 3752 rcode, 3755 - correlator)); 3753 + correlator); 3756 3754 } 3757 3755 3758 3756 if((err = smctr_send_rpt_attch(dev, rmf, 3759 3757 correlator))) 3760 3758 { 3761 - return (err); 3759 + return err; 3762 3760 } 3763 3761 break; 3764 3762 ··· 3767 3765 rmf, &correlator)) != POSITIVE_ACK) 3768 3766 { 3769 3767 if(rcode == HARDWARE_FAILED) 3770 - return (rcode); 3768 + return rcode; 3771 3769 else 3772 - return (smctr_send_rsp(dev, rmf, 3770 + return smctr_send_rsp(dev, rmf, 3773 3771 rcode, 3774 - correlator)); 3772 + correlator); 3775 3773 } 3776 3774 3777 3775 if((err = smctr_send_rpt_state(dev, rmf, 3778 3776 correlator))) 3779 3777 { 3780 - return (err); 3778 + return err; 3781 3779 } 3782 3780 break; 3783 3781 ··· 3788 3786 != POSITIVE_ACK) 3789 3787 { 3790 3788 if(rcode == HARDWARE_FAILED) 3791 - return (rcode); 3789 + return rcode; 3792 3790 else 3793 - return (smctr_send_rsp(dev, rmf, 3791 + return smctr_send_rsp(dev, rmf, 3794 3792 rcode, 3795 - correlator)); 3793 + correlator); 3796 3794 } 3797 3795 3798 3796 if((err = smctr_send_tx_forward(dev, rmf, 3799 3797 &tx_fstatus)) == HARDWARE_FAILED) 3800 3798 { 3801 - return (err); 3799 + return err; 3802 3800 } 3803 3801 3804 3802 if(err == A_FRAME_WAS_FORWARDED) ··· 3807 3805 rmf, tx_fstatus)) 3808 3806 == HARDWARE_FAILED) 3809 3807 { 3810 - return (err); 3808 + return err; 3811 3809 } 3812 3810 } 3813 3811 break; ··· 3836 3834 if((err = smctr_send_rsp(dev, rmf,rcode, 3837 3835 correlator))) 3838 3836 { 3839 - return (err); 3837 + return err; 3840 3838 } 3841 3839 } 3842 3840 ··· 3901 3899 err = 0; 3902 3900 } 3903 3901 3904 - return (err); 3902 + return err; 3905 3903 } 3906 3904 3907 3905 /* Adapter RAM test. Incremental word ODD boundary data test. */ ··· 3944 3942 err_offset = j; 3945 3943 err_word = word_read; 3946 3944 err_pattern = word_pattern; 3947 - return (RAM_TEST_FAILED); 3945 + return RAM_TEST_FAILED; 3948 3946 } 3949 3947 } 3950 3948 } ··· 3968 3966 err_offset = j; 3969 3967 err_word = word_read; 3970 3968 err_pattern = word_pattern; 3971 - return (RAM_TEST_FAILED); 3969 + return RAM_TEST_FAILED; 3972 3970 } 3973 3971 } 3974 3972 } 3975 3973 3976 3974 smctr_set_page(dev, (__u8 *)tp->ram_access); 3977 3975 3978 - return (0); 3976 + return 0; 3979 3977 } 3980 3978 3981 3979 static int smctr_rcv_chg_param(struct net_device *dev, MAC_HEADER *rmf, ··· 3988 3986 3989 3987 /* This Frame can only come from a CRS */ 3990 3988 if((rmf->dc_sc & SC_MASK) != SC_CRS) 3991 - return(E_INAPPROPRIATE_SOURCE_CLASS); 3989 + return E_INAPPROPRIATE_SOURCE_CLASS; 3992 3990 3993 3991 /* Remove MVID Length from total length. */ 3994 3992 vlen = (signed short)rmf->vl - 4; ··· 4060 4058 } 4061 4059 } 4062 4060 4063 - return (rcode); 4061 + return rcode; 4064 4062 } 4065 4063 4066 4064 static int smctr_rcv_init(struct net_device *dev, MAC_HEADER *rmf, ··· 4073 4071 4074 4072 /* This Frame can only come from a RPS */ 4075 4073 if((rmf->dc_sc & SC_MASK) != SC_RPS) 4076 - return (E_INAPPROPRIATE_SOURCE_CLASS); 4074 + return E_INAPPROPRIATE_SOURCE_CLASS; 4077 4075 4078 4076 /* Remove MVID Length from total length. */ 4079 4077 vlen = (signed short)rmf->vl - 4; ··· 4135 4133 } 4136 4134 } 4137 4135 4138 - return (rcode); 4136 + return rcode; 4139 4137 } 4140 4138 4141 4139 static int smctr_rcv_tx_forward(struct net_device *dev, MAC_HEADER *rmf) ··· 4147 4145 4148 4146 /* This Frame can only come from a CRS */ 4149 4147 if((rmf->dc_sc & SC_MASK) != SC_CRS) 4150 - return (E_INAPPROPRIATE_SOURCE_CLASS); 4148 + return E_INAPPROPRIATE_SOURCE_CLASS; 4151 4149 4152 4150 /* Remove MVID Length from total length */ 4153 4151 vlen = (signed short)rmf->vl - 4; ··· 4195 4193 } 4196 4194 } 4197 4195 4198 - return (rcode); 4196 + return rcode; 4199 4197 } 4200 4198 4201 4199 static int smctr_rcv_rq_addr_state_attch(struct net_device *dev, ··· 4252 4250 } 4253 4251 } 4254 4252 4255 - return (rcode); 4253 + return rcode; 4256 4254 } 4257 4255 4258 4256 static int smctr_rcv_unknown(struct net_device *dev, MAC_HEADER *rmf, ··· 4286 4284 rsv = (MAC_SUB_VECTOR *)((__u32)rsv + rsv->svl); 4287 4285 } 4288 4286 4289 - return (E_UNRECOGNIZED_VECTOR_ID); 4287 + return E_UNRECOGNIZED_VECTOR_ID; 4290 4288 } 4291 4289 4292 4290 /* ··· 4313 4311 */ 4314 4312 outb(tp->trc_mask | CSR_CLRTINT | CSR_CLRCBUSY, ioaddr + CSR); 4315 4313 4316 - return (0); 4314 + return 0; 4317 4315 } 4318 4316 4319 4317 static int smctr_restart_tx_chain(struct net_device *dev, short queue) ··· 4331 4329 err = smctr_issue_resume_tx_fcb_cmd(dev, queue); 4332 4330 } 4333 4331 4334 - return (err); 4332 + return err; 4335 4333 } 4336 4334 4337 4335 static int smctr_ring_status_chg(struct net_device *dev) ··· 4373 4371 } 4374 4372 4375 4373 if(!(tp->ring_status_flags & RING_STATUS_CHANGED)) 4376 - return (0); 4374 + return 0; 4377 4375 4378 4376 switch(tp->ring_status) 4379 4377 { ··· 4423 4421 break; 4424 4422 } 4425 4423 4426 - return (0); 4424 + return 0; 4427 4425 } 4428 4426 4429 4427 static int smctr_rx_frame(struct net_device *dev) ··· 4488 4486 break; 4489 4487 } 4490 4488 4491 - return (err); 4489 + return err; 4492 4490 } 4493 4491 4494 4492 static int smctr_send_dat(struct net_device *dev) ··· 4504 4502 if((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE, 4505 4503 sizeof(MAC_HEADER))) == (FCBlock *)(-1L)) 4506 4504 { 4507 - return (OUT_OF_RESOURCES); 4505 + return OUT_OF_RESOURCES; 4508 4506 } 4509 4507 4510 4508 /* Initialize DAT Data Fields. */ ··· 4526 4524 4527 4525 /* Start Transmit. */ 4528 4526 if((err = smctr_trc_send_packet(dev, fcb, MAC_QUEUE))) 4529 - return (err); 4527 + return err; 4530 4528 4531 4529 /* Wait for Transmit to Complete */ 4532 4530 for(i = 0; i < 10000; i++) ··· 4540 4538 if(!(fcb->frame_status & FCB_COMMAND_DONE) || 4541 4539 fcb->frame_status & (FCB_TX_STATUS_E | FCB_TX_AC_BITS)) 4542 4540 { 4543 - return (INITIALIZE_FAILED); 4541 + return INITIALIZE_FAILED; 4544 4542 } 4545 4543 4546 4544 /* De-allocated Tx FCB and Frame Buffer ··· 4551 4549 tp->tx_queue_status[MAC_QUEUE] = NOT_TRANSMITING; 4552 4550 smctr_update_tx_chain(dev, fcb, MAC_QUEUE); 4553 4551 4554 - return (0); 4552 + return 0; 4555 4553 } 4556 4554 4557 4555 static void smctr_timeout(struct net_device *dev) ··· 4612 4610 if((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE, sizeof(struct trh_hdr) 4613 4611 + S_WRAP_DATA + S_WRAP_DATA)) == (FCBlock *)(-1L)) 4614 4612 { 4615 - return (OUT_OF_RESOURCES); 4613 + return OUT_OF_RESOURCES; 4616 4614 } 4617 4615 4618 4616 /* Initialize DAT Data Fields. */ ··· 4641 4639 /* Start Transmit. */ 4642 4640 tmf->vl = SWAP_BYTES(tmf->vl); 4643 4641 if((err = smctr_trc_send_packet(dev, fcb, MAC_QUEUE))) 4644 - return (err); 4642 + return err; 4645 4643 4646 4644 /* Wait for Transmit to Complete. (10 ms). */ 4647 4645 for(i=0; i < 10000; i++) ··· 4655 4653 if(!(fcb->frame_status & FCB_COMMAND_DONE) || 4656 4654 fcb->frame_status & (FCB_TX_STATUS_E | FCB_TX_AC_BITS)) 4657 4655 { 4658 - return (LOBE_MEDIA_TEST_FAILED); 4656 + return LOBE_MEDIA_TEST_FAILED; 4659 4657 } 4660 4658 4661 4659 /* De-allocated Tx FCB and Frame Buffer ··· 4666 4664 tp->tx_queue_status[MAC_QUEUE] = NOT_TRANSMITING; 4667 4665 smctr_update_tx_chain(dev, fcb, MAC_QUEUE); 4668 4666 4669 - return (0); 4667 + return 0; 4670 4668 } 4671 4669 4672 4670 static int smctr_send_rpt_addr(struct net_device *dev, MAC_HEADER *rmf, ··· 4681 4679 + S_ADDRESS_MODIFER + S_GROUP_ADDRESS + S_FUNCTIONAL_ADDRESS)) 4682 4680 == (FCBlock *)(-1L)) 4683 4681 { 4684 - return (0); 4682 + return 0; 4685 4683 } 4686 4684 4687 4685 tmf = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr; ··· 4724 4722 */ 4725 4723 tmf->vl = SWAP_BYTES(tmf->vl); 4726 4724 4727 - return (smctr_trc_send_packet(dev, fcb, MAC_QUEUE)); 4725 + return smctr_trc_send_packet(dev, fcb, MAC_QUEUE); 4728 4726 } 4729 4727 4730 4728 static int smctr_send_rpt_attch(struct net_device *dev, MAC_HEADER *rmf, ··· 4739 4737 + S_AUTHORIZED_FUNCTION_CLASS + S_AUTHORIZED_ACCESS_PRIORITY)) 4740 4738 == (FCBlock *)(-1L)) 4741 4739 { 4742 - return (0); 4740 + return 0; 4743 4741 } 4744 4742 4745 4743 tmf = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr; ··· 4778 4776 */ 4779 4777 tmf->vl = SWAP_BYTES(tmf->vl); 4780 4778 4781 - return (smctr_trc_send_packet(dev, fcb, MAC_QUEUE)); 4779 + return smctr_trc_send_packet(dev, fcb, MAC_QUEUE); 4782 4780 } 4783 4781 4784 4782 static int smctr_send_rpt_state(struct net_device *dev, MAC_HEADER *rmf, ··· 4793 4791 + S_RING_STATION_STATUS + S_STATION_IDENTIFER)) 4794 4792 == (FCBlock *)(-1L)) 4795 4793 { 4796 - return (0); 4794 + return 0; 4797 4795 } 4798 4796 4799 4797 tmf = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr; ··· 4828 4826 */ 4829 4827 tmf->vl = SWAP_BYTES(tmf->vl); 4830 4828 4831 - return (smctr_trc_send_packet(dev, fcb, MAC_QUEUE)); 4829 + return smctr_trc_send_packet(dev, fcb, MAC_QUEUE); 4832 4830 } 4833 4831 4834 4832 static int smctr_send_rpt_tx_forward(struct net_device *dev, ··· 4841 4839 if((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE, sizeof(MAC_HEADER) 4842 4840 + S_TRANSMIT_STATUS_CODE)) == (FCBlock *)(-1L)) 4843 4841 { 4844 - return (0); 4842 + return 0; 4845 4843 } 4846 4844 4847 4845 tmf = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr; ··· 4864 4862 */ 4865 4863 tmf->vl = SWAP_BYTES(tmf->vl); 4866 4864 4867 - return(smctr_trc_send_packet(dev, fcb, MAC_QUEUE)); 4865 + return smctr_trc_send_packet(dev, fcb, MAC_QUEUE); 4868 4866 } 4869 4867 4870 4868 static int smctr_send_rsp(struct net_device *dev, MAC_HEADER *rmf, ··· 4877 4875 if((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE, sizeof(MAC_HEADER) 4878 4876 + S_CORRELATOR + S_RESPONSE_CODE)) == (FCBlock *)(-1L)) 4879 4877 { 4880 - return (0); 4878 + return 0; 4881 4879 } 4882 4880 4883 4881 tmf = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr; ··· 4890 4888 tsv = (MAC_SUB_VECTOR *)((__u32)tmf + sizeof(MAC_HEADER)); 4891 4889 smctr_make_corr(dev, tsv, correlator); 4892 4890 4893 - return (0); 4891 + return 0; 4894 4892 } 4895 4893 4896 4894 static int smctr_send_rq_init(struct net_device *dev) ··· 4909 4907 + S_RING_STATION_VERSION_NUMBER + S_ADDRESS_MODIFER)) 4910 4908 == (FCBlock *)(-1L))) 4911 4909 { 4912 - return (0); 4910 + return 0; 4913 4911 } 4914 4912 4915 4913 tmf = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr; ··· 4945 4943 tmf->vl = SWAP_BYTES(tmf->vl); 4946 4944 4947 4945 if((err = smctr_trc_send_packet(dev, fcb, MAC_QUEUE))) 4948 - return (err); 4946 + return err; 4949 4947 4950 4948 /* Wait for Transmit to Complete */ 4951 4949 for(i = 0; i < 10000; i++) ··· 4959 4957 fstatus = fcb->frame_status; 4960 4958 4961 4959 if(!(fstatus & FCB_COMMAND_DONE)) 4962 - return (HARDWARE_FAILED); 4960 + return HARDWARE_FAILED; 4963 4961 4964 4962 if(!(fstatus & FCB_TX_STATUS_E)) 4965 4963 count++; ··· 4973 4971 smctr_update_tx_chain(dev, fcb, MAC_QUEUE); 4974 4972 } while(count < 4 && ((fstatus & FCB_TX_AC_BITS) ^ FCB_TX_AC_BITS)); 4975 4973 4976 - return (smctr_join_complete_state(dev)); 4974 + return smctr_join_complete_state(dev); 4977 4975 } 4978 4976 4979 4977 static int smctr_send_tx_forward(struct net_device *dev, MAC_HEADER *rmf, ··· 4986 4984 4987 4985 /* Check if this is the END POINT of the Transmit Forward Chain. */ 4988 4986 if(rmf->vl <= 18) 4989 - return (0); 4987 + return 0; 4990 4988 4991 4989 /* Allocate Transmit FCB only by requesting 0 bytes 4992 4990 * of data buffer. 4993 4991 */ 4994 4992 if((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE, 0)) == (FCBlock *)(-1L)) 4995 - return (0); 4993 + return 0; 4996 4994 4997 4995 /* Set pointer to Transmit Frame Buffer to the data 4998 4996 * portion of the received TX Forward frame, making ··· 5008 5006 fcb->bdb_ptr->buffer_length = rmf->vl - 4 - 2; 5009 5007 5010 5008 if((err = smctr_trc_send_packet(dev, fcb, MAC_QUEUE))) 5011 - return (err); 5009 + return err; 5012 5010 5013 5011 /* Wait for Transmit to Complete */ 5014 5012 for(i = 0; i < 10000; i++) ··· 5022 5020 if(!(fcb->frame_status & FCB_COMMAND_DONE)) 5023 5021 { 5024 5022 if((err = smctr_issue_resume_tx_fcb_cmd(dev, MAC_QUEUE))) 5025 - return (err); 5023 + return err; 5026 5024 5027 5025 for(i = 0; i < 10000; i++) 5028 5026 { ··· 5032 5030 } 5033 5031 5034 5032 if(!(fcb->frame_status & FCB_COMMAND_DONE)) 5035 - return (HARDWARE_FAILED); 5033 + return HARDWARE_FAILED; 5036 5034 } 5037 5035 5038 5036 *tx_fstatus = fcb->frame_status; 5039 5037 5040 - return (A_FRAME_WAS_FORWARDED); 5038 + return A_FRAME_WAS_FORWARDED; 5041 5039 } 5042 5040 5043 5041 static int smctr_set_auth_access_pri(struct net_device *dev, ··· 5046 5044 struct net_local *tp = netdev_priv(dev); 5047 5045 5048 5046 if(rsv->svl != S_AUTHORIZED_ACCESS_PRIORITY) 5049 - return (E_SUB_VECTOR_LENGTH_ERROR); 5047 + return E_SUB_VECTOR_LENGTH_ERROR; 5050 5048 5051 5049 tp->authorized_access_priority = (rsv->svv[0] << 8 | rsv->svv[1]); 5052 5050 5053 - return (POSITIVE_ACK); 5051 + return POSITIVE_ACK; 5054 5052 } 5055 5053 5056 5054 static int smctr_set_auth_funct_class(struct net_device *dev, ··· 5059 5057 struct net_local *tp = netdev_priv(dev); 5060 5058 5061 5059 if(rsv->svl != S_AUTHORIZED_FUNCTION_CLASS) 5062 - return (E_SUB_VECTOR_LENGTH_ERROR); 5060 + return E_SUB_VECTOR_LENGTH_ERROR; 5063 5061 5064 5062 tp->authorized_function_classes = (rsv->svv[0] << 8 | rsv->svv[1]); 5065 5063 5066 - return (POSITIVE_ACK); 5064 + return POSITIVE_ACK; 5067 5065 } 5068 5066 5069 5067 static int smctr_set_corr(struct net_device *dev, MAC_SUB_VECTOR *rsv, 5070 5068 __u16 *correlator) 5071 5069 { 5072 5070 if(rsv->svl != S_CORRELATOR) 5073 - return (E_SUB_VECTOR_LENGTH_ERROR); 5071 + return E_SUB_VECTOR_LENGTH_ERROR; 5074 5072 5075 5073 *correlator = (rsv->svv[0] << 8 | rsv->svv[1]); 5076 5074 5077 - return (POSITIVE_ACK); 5075 + return POSITIVE_ACK; 5078 5076 } 5079 5077 5080 5078 static int smctr_set_error_timer_value(struct net_device *dev, ··· 5084 5082 int err; 5085 5083 5086 5084 if(rsv->svl != S_ERROR_TIMER_VALUE) 5087 - return (E_SUB_VECTOR_LENGTH_ERROR); 5085 + return E_SUB_VECTOR_LENGTH_ERROR; 5088 5086 5089 5087 err_tval = (rsv->svv[0] << 8 | rsv->svv[1])*10; 5090 5088 5091 5089 smctr_issue_write_word_cmd(dev, RW_TER_THRESHOLD, &err_tval); 5092 5090 5093 5091 if((err = smctr_wait_cmd(dev))) 5094 - return (err); 5092 + return err; 5095 5093 5096 - return (POSITIVE_ACK); 5094 + return POSITIVE_ACK; 5097 5095 } 5098 5096 5099 5097 static int smctr_set_frame_forward(struct net_device *dev, 5100 5098 MAC_SUB_VECTOR *rsv, __u8 dc_sc) 5101 5099 { 5102 5100 if((rsv->svl < 2) || (rsv->svl > S_FRAME_FORWARD)) 5103 - return (E_SUB_VECTOR_LENGTH_ERROR); 5101 + return E_SUB_VECTOR_LENGTH_ERROR; 5104 5102 5105 5103 if((dc_sc & DC_MASK) != DC_CRS) 5106 5104 { 5107 5105 if(rsv->svl >= 2 && rsv->svl < 20) 5108 - return (E_TRANSMIT_FORWARD_INVALID); 5106 + return E_TRANSMIT_FORWARD_INVALID; 5109 5107 5110 5108 if((rsv->svv[0] != 0) || (rsv->svv[1] != 0)) 5111 - return (E_TRANSMIT_FORWARD_INVALID); 5109 + return E_TRANSMIT_FORWARD_INVALID; 5112 5110 } 5113 5111 5114 - return (POSITIVE_ACK); 5112 + return POSITIVE_ACK; 5115 5113 } 5116 5114 5117 5115 static int smctr_set_local_ring_num(struct net_device *dev, ··· 5120 5118 struct net_local *tp = netdev_priv(dev); 5121 5119 5122 5120 if(rsv->svl != S_LOCAL_RING_NUMBER) 5123 - return (E_SUB_VECTOR_LENGTH_ERROR); 5121 + return E_SUB_VECTOR_LENGTH_ERROR; 5124 5122 5125 5123 if(tp->ptr_local_ring_num) 5126 5124 *(__u16 *)(tp->ptr_local_ring_num) 5127 5125 = (rsv->svv[0] << 8 | rsv->svv[1]); 5128 5126 5129 - return (POSITIVE_ACK); 5127 + return POSITIVE_ACK; 5130 5128 } 5131 5129 5132 5130 static unsigned short smctr_set_ctrl_attention(struct net_device *dev) ··· 5142 5140 outb(tp->trc_mask, ioaddr + CSR); 5143 5141 } 5144 5142 5145 - return (0); 5143 + return 0; 5146 5144 } 5147 5145 5148 5146 static void smctr_set_multicast_list(struct net_device *dev) ··· 5161 5159 amask = (__u8)((tptr & PR_PAGE_MASK) >> 8); 5162 5160 outb(amask, dev->base_addr + PR); 5163 5161 5164 - return (0); 5162 + return 0; 5165 5163 } 5166 5164 5167 5165 static int smctr_set_phy_drop(struct net_device *dev, MAC_SUB_VECTOR *rsv) ··· 5169 5167 int err; 5170 5168 5171 5169 if(rsv->svl != S_PHYSICAL_DROP) 5172 - return (E_SUB_VECTOR_LENGTH_ERROR); 5170 + return E_SUB_VECTOR_LENGTH_ERROR; 5173 5171 5174 5172 smctr_issue_write_byte_cmd(dev, RW_PHYSICAL_DROP_NUMBER, &rsv->svv[0]); 5175 5173 if((err = smctr_wait_cmd(dev))) 5176 - return (err); 5174 + return err; 5177 5175 5178 - return (POSITIVE_ACK); 5176 + return POSITIVE_ACK; 5179 5177 } 5180 5178 5181 5179 /* Reset the ring speed to the opposite of what it was. This auto-pilot ··· 5197 5195 smctr_reset_adapter(dev); 5198 5196 5199 5197 if((err = smctr_init_card_real(dev))) 5200 - return (err); 5198 + return err; 5201 5199 5202 5200 smctr_enable_bic_int(dev); 5203 5201 5204 5202 if((err = smctr_issue_enable_int_cmd(dev, TRC_INTERRUPT_ENABLE_MASK))) 5205 - return (err); 5203 + return err; 5206 5204 5207 5205 smctr_disable_16bit(dev); 5208 5206 5209 - return (0); 5207 + return 0; 5210 5208 } 5211 5209 5212 5210 static int smctr_set_rx_look_ahead(struct net_device *dev) ··· 5235 5233 *((__u16 *)(tp->ram_access)) = sword; 5236 5234 } 5237 5235 5238 - return (0); 5236 + return 0; 5239 5237 } 5240 5238 5241 5239 static int smctr_set_trc_reset(int ioaddr) ··· 5245 5243 r = inb(ioaddr + MSR); 5246 5244 outb(MSR_RST | r, ioaddr + MSR); 5247 5245 5248 - return (0); 5246 + return 0; 5249 5247 } 5250 5248 5251 5249 /* ··· 5261 5259 printk(KERN_DEBUG "%s: smctr_setup_single_cmd\n", dev->name); 5262 5260 5263 5261 if((err = smctr_wait_while_cbusy(dev))) 5264 - return (err); 5262 + return err; 5265 5263 5266 5264 if((err = (unsigned int)smctr_wait_cmd(dev))) 5267 - return (err); 5265 + return err; 5268 5266 5269 5267 tp->acb_head->cmd_done_status = 0; 5270 5268 tp->acb_head->cmd = command; ··· 5272 5270 5273 5271 err = smctr_issue_resume_acb_cmd(dev); 5274 5272 5275 - return (err); 5273 + return err; 5276 5274 } 5277 5275 5278 5276 /* ··· 5289 5287 tp->acb_head->data_offset_lo 5290 5288 = (__u16)TRC_POINTER(tp->misc_command_data); 5291 5289 5292 - return(smctr_issue_resume_acb_cmd(dev)); 5290 + return smctr_issue_resume_acb_cmd(dev); 5293 5291 } 5294 5292 5295 5293 static char *smctr_malloc(struct net_device *dev, __u16 size) ··· 5300 5298 m = (char *)(tp->ram_access + tp->sh_mem_used); 5301 5299 tp->sh_mem_used += (__u32)size; 5302 5300 5303 - return (m); 5301 + return m; 5304 5302 } 5305 5303 5306 5304 static int smctr_status_chg(struct net_device *dev) ··· 5335 5333 break; 5336 5334 } 5337 5335 5338 - return (0); 5336 + return 0; 5339 5337 } 5340 5338 5341 5339 static int smctr_trc_send_packet(struct net_device *dev, FCBlock *fcb, ··· 5357 5355 err = smctr_issue_resume_tx_fcb_cmd(dev, queue); 5358 5356 } 5359 5357 5360 - return (err); 5358 + return err; 5361 5359 } 5362 5360 5363 5361 static __u16 smctr_tx_complete(struct net_device *dev, __u16 queue) ··· 5411 5409 break; 5412 5410 } 5413 5411 5414 - return (err); 5412 + return err; 5415 5413 } 5416 5414 5417 5415 static unsigned short smctr_tx_move_frame(struct net_device *dev, ··· 5452 5450 pbuff += len; 5453 5451 } 5454 5452 5455 - return (0); 5453 + return 0; 5456 5454 } 5457 5455 5458 5456 /* Update the error statistic counters for this adapter. */ ··· 5495 5493 if(tstat->token_errors) 5496 5494 tstat->token_errors += *(tp->misc_command_data + 5) >> 8; 5497 5495 5498 - return (0); 5496 + return 0; 5499 5497 } 5500 5498 5501 5499 static int smctr_update_rx_chain(struct net_device *dev, __u16 queue) ··· 5532 5530 tp->rx_bdb_curr[queue]->back_ptr->info = BDB_NOT_CHAIN_END; 5533 5531 tp->rx_bdb_curr[queue] = bdb; 5534 5532 5535 - return (0); 5533 + return 0; 5536 5534 } 5537 5535 5538 5536 static int smctr_update_tx_chain(struct net_device *dev, FCBlock *fcb, ··· 5544 5542 printk(KERN_DEBUG "smctr_update_tx_chain\n"); 5545 5543 5546 5544 if(tp->num_tx_fcbs_used[queue] <= 0) 5547 - return (HARDWARE_FAILED); 5545 + return HARDWARE_FAILED; 5548 5546 else 5549 5547 { 5550 5548 if(tp->tx_buff_used[queue] < fcb->memory_alloc) 5551 5549 { 5552 5550 tp->tx_buff_used[queue] = 0; 5553 - return (HARDWARE_FAILED); 5551 + return HARDWARE_FAILED; 5554 5552 } 5555 5553 5556 5554 tp->tx_buff_used[queue] -= fcb->memory_alloc; ··· 5568 5566 fcb->frame_status = 0; 5569 5567 tp->tx_fcb_end[queue] = fcb->next_ptr; 5570 5568 netif_wake_queue(dev); 5571 - return (0); 5569 + return 0; 5572 5570 } 5573 5571 } 5574 5572 ··· 5589 5587 } 5590 5588 5591 5589 if(loop_count == 0) 5592 - return(HARDWARE_FAILED); 5590 + return HARDWARE_FAILED; 5593 5591 5594 5592 if(tp->acb_head->cmd_done_status & 0xff) 5595 - return(HARDWARE_FAILED); 5593 + return HARDWARE_FAILED; 5596 5594 5597 - return (0); 5595 + return 0; 5598 5596 } 5599 5597 5600 5598 static int smctr_wait_while_cbusy(struct net_device *dev) ··· 5626 5624 } 5627 5625 5628 5626 if(timeout) 5629 - return (0); 5627 + return 0; 5630 5628 else 5631 - return (HARDWARE_FAILED); 5629 + return HARDWARE_FAILED; 5632 5630 } 5633 5631 5634 5632 #ifdef MODULE
+29 -29
drivers/net/tokenring/tms380tr.c
··· 224 224 chk2 ^= 0x0FE; 225 225 226 226 if(chk1 != chk2) 227 - return (-1); /* No adapter */ 227 + return -1; /* No adapter */ 228 228 chk1 -= 2; 229 229 } while(chk1 != 0); /* Repeat 128 times (all byte values) */ 230 230 ··· 232 232 /* Restore the SIFADR value */ 233 233 SIFWRITEB(old, SIFADR); 234 234 235 - return (0); 235 + return 0; 236 236 } 237 237 #endif 238 238 ··· 271 271 { 272 272 printk(KERN_INFO "%s: Chipset initialization error\n", 273 273 dev->name); 274 - return (-1); 274 + return -1; 275 275 } 276 276 277 277 tp->timer.expires = jiffies + 30*HZ; ··· 298 298 if(tp->AdapterVirtOpenFlag == 0) 299 299 { 300 300 tms380tr_disable_interrupts(dev); 301 - return (-1); 301 + return -1; 302 302 } 303 303 304 304 tp->StartTime = jiffies; ··· 309 309 tp->timer.data = (unsigned long)dev; 310 310 add_timer(&tp->timer); 311 311 312 - return (0); 312 + return 0; 313 313 } 314 314 315 315 /* ··· 343 343 printk(KERN_DEBUG "%s: Resetting adapter...\n", dev->name); 344 344 err = tms380tr_reset_adapter(dev); 345 345 if(err < 0) 346 - return (-1); 346 + return -1; 347 347 348 348 if(tms380tr_debug > 3) 349 349 printk(KERN_DEBUG "%s: Bringup diags...\n", dev->name); 350 350 err = tms380tr_bringup_diags(dev); 351 351 if(err < 0) 352 - return (-1); 352 + return -1; 353 353 354 354 if(tms380tr_debug > 3) 355 355 printk(KERN_DEBUG "%s: Init adapter...\n", dev->name); 356 356 err = tms380tr_init_adapter(dev); 357 357 if(err < 0) 358 - return (-1); 358 + return -1; 359 359 360 360 if(tms380tr_debug > 3) 361 361 printk(KERN_DEBUG "%s: Done!\n", dev->name); 362 - return (0); 362 + return 0; 363 363 } 364 364 365 365 /* ··· 877 877 IrqType != STS_IRQ_COMMAND_STATUS && 878 878 IrqType != STS_IRQ_RING_STATUS) 879 879 { 880 - return (1); /* SSB not involved. */ 880 + return 1; /* SSB not involved. */ 881 881 } 882 882 883 883 /* Note: All fields of the SSB have been set to all ones (-1) after it ··· 887 887 */ 888 888 889 889 if(ssb->STS == (unsigned short) -1) 890 - return (0); /* Command field not yet available. */ 890 + return 0; /* Command field not yet available. */ 891 891 if(IrqType == STS_IRQ_COMMAND_STATUS) 892 - return (1); /* Status fields not always affected. */ 892 + return 1; /* Status fields not always affected. */ 893 893 if(ssb->Parm[0] == (unsigned short) -1) 894 - return (0); /* Status 1 field not yet available. */ 894 + return 0; /* Status 1 field not yet available. */ 895 895 if(IrqType == STS_IRQ_RING_STATUS) 896 - return (1); /* Status 2 & 3 fields not affected. */ 896 + return 1; /* Status 2 & 3 fields not affected. */ 897 897 898 898 /* Note: At this point, the interrupt is either TRANSMIT or RECEIVE. */ 899 899 if(ssb->Parm[1] == (unsigned short) -1) 900 - return (0); /* Status 2 field not yet available. */ 900 + return 0; /* Status 2 field not yet available. */ 901 901 if(ssb->Parm[2] == (unsigned short) -1) 902 - return (0); /* Status 3 field not yet available. */ 902 + return 0; /* Status 3 field not yet available. */ 903 903 904 - return (1); /* All SSB fields have been written by the adapter. */ 904 + return 1; /* All SSB fields have been written by the adapter. */ 905 905 } 906 906 907 907 /* ··· 1143 1143 #endif 1144 1144 tms380tr_cancel_tx_queue(tp); 1145 1145 1146 - return (0); 1146 + return 0; 1147 1147 } 1148 1148 1149 1149 /* ··· 1154 1154 { 1155 1155 struct net_local *tp = netdev_priv(dev); 1156 1156 1157 - return ((struct net_device_stats *)&tp->MacStat); 1157 + return (struct net_device_stats *)&tp->MacStat; 1158 1158 } 1159 1159 1160 1160 /* ··· 1256 1256 if (request_firmware(&fw_entry, "tms380tr.bin", tp->pdev) != 0) { 1257 1257 printk(KERN_ALERT "%s: firmware %s is missing, cannot start.\n", 1258 1258 dev->name, "tms380tr.bin"); 1259 - return (-1); 1259 + return -1; 1260 1260 } 1261 1261 1262 1262 fw_ptr = (unsigned short *)fw_entry->data; ··· 1322 1322 /* Clear CPHALT and start BUD */ 1323 1323 SIFWRITEW(c, SIFACL); 1324 1324 release_firmware(fw_entry); 1325 - return (1); 1325 + return 1; 1326 1326 } 1327 1327 } while(count == 0); 1328 1328 1329 1329 release_firmware(fw_entry); 1330 1330 printk(KERN_INFO "%s: Adapter Download Failed\n", dev->name); 1331 - return (-1); 1331 + return -1; 1332 1332 } 1333 1333 1334 1334 MODULE_FIRMWARE("tms380tr.bin"); ··· 1363 1363 printk(KERN_DEBUG " %04X\n", Status); 1364 1364 /* BUD successfully completed */ 1365 1365 if(Status == STS_INITIALIZE) 1366 - return (1); 1366 + return 1; 1367 1367 /* Unrecoverable hardware error, BUD not completed? */ 1368 1368 } while((loop_cnt > 0) && ((Status & (STS_ERROR | STS_TEST)) 1369 1369 != (STS_ERROR | STS_TEST))); ··· 1390 1390 else 1391 1391 printk(KERN_INFO "%s: Bring Up Diagnostics Error (%04X) occurred\n", dev->name, Status & 0x000f); 1392 1392 1393 - return (-1); 1393 + return -1; 1394 1394 } 1395 1395 1396 1396 /* ··· 1464 1464 { 1465 1465 printk(KERN_INFO "%s: DMA failed\n", dev->name); 1466 1466 /* DMA data error: wrong data in SCB */ 1467 - return (-1); 1467 + return -1; 1468 1468 } 1469 1469 i++; 1470 1470 } while(i < 6); ··· 1473 1473 do { /* Test if contents of SSB is valid */ 1474 1474 if(SSB_Test[i] != *(sb_ptr + i)) 1475 1475 /* DMA data error: wrong data in SSB */ 1476 - return (-1); 1476 + return -1; 1477 1477 i++; 1478 1478 } while (i < 8); 1479 1479 1480 - return (1); /* Adapter successfully initialized */ 1480 + return 1; /* Adapter successfully initialized */ 1481 1481 } 1482 1482 else 1483 1483 { ··· 1488 1488 Status &= STS_ERROR_MASK; 1489 1489 /* ShowInitialisationErrorCode(Status); */ 1490 1490 printk(KERN_INFO "%s: Status error: %d\n", dev->name, Status); 1491 - return (-1); /* Unrecoverable error */ 1491 + return -1; /* Unrecoverable error */ 1492 1492 } 1493 1493 else 1494 1494 { ··· 1503 1503 } while(retry_cnt > 0); 1504 1504 1505 1505 printk(KERN_INFO "%s: Retry exceeded\n", dev->name); 1506 - return (-1); 1506 + return -1; 1507 1507 } 1508 1508 1509 1509 /*
+1 -1
drivers/net/tsi108_eth.c
··· 219 219 if (i == 100) 220 220 return 0xffff; 221 221 else 222 - return (TSI_READ_PHY(TSI108_MAC_MII_DATAIN)); 222 + return TSI_READ_PHY(TSI108_MAC_MII_DATAIN); 223 223 } 224 224 225 225 static void tsi108_write_mii(struct tsi108_prv_data *data,
+18 -18
drivers/net/tulip/de4x5.c
··· 3119 3119 if (lp->media == _100Mb) { 3120 3120 if ((slnk = test_for_100Mb(dev, 6500)) < 0) { 3121 3121 lp->media = SPD_DET; 3122 - return (slnk & ~TIMER_CB); 3122 + return slnk & ~TIMER_CB; 3123 3123 } 3124 3124 } else { 3125 3125 if (wait_for_link(dev) < 0) { ··· 3484 3484 spd = ((~gep_rd(dev)) & GEP_SLNK); 3485 3485 } else { 3486 3486 if ((lp->ibn == 2) || !lp->asBitValid) 3487 - return ((lp->chipset == DC21143)?(~inl(DE4X5_SISR)&SISR_LS100):0); 3487 + return (lp->chipset == DC21143) ? (~inl(DE4X5_SISR)&SISR_LS100) : 0; 3488 3488 3489 3489 spd = (lp->asBitValid & (lp->asPolarity ^ (gep_rd(dev) & lp->asBit))) | 3490 3490 (lp->linkOK & ~lp->asBitValid); ··· 3502 3502 if (lp->useMII) { 3503 3503 /* Double read for sticky bits & temporary drops */ 3504 3504 mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII); 3505 - return (mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS); 3505 + return mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS; 3506 3506 } else if (!lp->useSROM) { /* de500-xa */ 3507 - return ((~gep_rd(dev)) & GEP_SLNK); 3507 + return (~gep_rd(dev)) & GEP_SLNK; 3508 3508 } else { 3509 3509 if ((lp->ibn == 2) || !lp->asBitValid) 3510 - return ((lp->chipset == DC21143)?(~inl(DE4X5_SISR)&SISR_LS100):0); 3510 + return (lp->chipset == DC21143) ? (~inl(DE4X5_SISR)&SISR_LS100) : 0; 3511 3511 3512 - return ((lp->asBitValid&(lp->asPolarity^(gep_rd(dev)&lp->asBit))) | 3513 - (lp->linkOK & ~lp->asBitValid)); 3512 + return (lp->asBitValid&(lp->asPolarity^(gep_rd(dev)&lp->asBit))) | 3513 + (lp->linkOK & ~lp->asBitValid); 3514 3514 } 3515 3515 } 3516 3516 ··· 3523 3523 if (lp->useMII) { 3524 3524 /* Double read for sticky bits & temporary drops */ 3525 3525 mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII); 3526 - return (mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS); 3526 + return mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS; 3527 3527 } else if (!lp->useSROM) { /* de500-xa */ 3528 - return ((~gep_rd(dev)) & GEP_LNP); 3528 + return (~gep_rd(dev)) & GEP_LNP; 3529 3529 } else { 3530 3530 if ((lp->ibn == 2) || !lp->asBitValid) 3531 - return (((lp->chipset & ~0x00ff) == DC2114x) ? 3531 + return ((lp->chipset & ~0x00ff) == DC2114x) ? 3532 3532 (~inl(DE4X5_SISR)&SISR_LS10): 3533 - 0); 3533 + 0; 3534 3534 3535 - return ((lp->asBitValid&(lp->asPolarity^(gep_rd(dev)&lp->asBit))) | 3536 - (lp->linkOK & ~lp->asBitValid)); 3535 + return (lp->asBitValid&(lp->asPolarity^(gep_rd(dev)&lp->asBit))) | 3536 + (lp->linkOK & ~lp->asBitValid); 3537 3537 } 3538 3538 } 3539 3539 ··· 3544 3544 u_long iobase = dev->base_addr; 3545 3545 3546 3546 if (lp->phy[lp->active].id && (!lp->useSROM || lp->useMII)) { 3547 - return (mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII)); 3547 + return mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII); 3548 3548 } else if ((lp->chipset & ~0x00ff) == DC2114x) { 3549 3549 return (inl(DE4X5_SISR) & SISR_LPN) >> 12; 3550 3550 } else { ··· 4930 4930 outl(command | MII_MDC, ioaddr); 4931 4931 udelay(1); 4932 4932 4933 - return ((inl(ioaddr) >> 19) & 1); 4933 + return (inl(ioaddr) >> 19) & 1; 4934 4934 } 4935 4935 4936 4936 /* ··· 4975 4975 a.breg[0]=a.breg[1]; 4976 4976 a.breg[1]=i; 4977 4977 4978 - return ((a.reg<<8)|ret); */ /* SEEQ and Cypress way */ 4979 - /* return ((r2<<6)|(u_int)(r3>>10)); */ /* NATIONAL and BROADCOM way */ 4978 + return (a.reg<<8)|ret; */ /* SEEQ and Cypress way */ 4979 + /* return (r2<<6)|(u_int)(r3>>10); */ /* NATIONAL and BROADCOM way */ 4980 4980 return r2; /* (I did it) My way */ 4981 4981 } 4982 4982 ··· 5144 5144 if (lp->chipset == DC21140) { 5145 5145 return inl(DE4X5_GEP); 5146 5146 } else if ((lp->chipset & ~0x00ff) == DC2114x) { 5147 - return (inl(DE4X5_SIGR) & 0x000fffff); 5147 + return inl(DE4X5_SIGR) & 0x000fffff; 5148 5148 } 5149 5149 5150 5150 return 0;
+1 -1
drivers/net/tulip/uli526x.c
··· 1747 1747 if(cr10_value&0x10000000) 1748 1748 break; 1749 1749 } 1750 - return (cr10_value&0x0ffff); 1750 + return cr10_value & 0x0ffff; 1751 1751 } 1752 1752 1753 1753 static void phy_writeby_cr10(unsigned long iobase, u8 phy_addr, u8 offset, u16 phy_data)
+1 -1
drivers/net/typhoon.c
··· 541 541 542 542 indexes->respCleared = cpu_to_le32(cleared); 543 543 wmb(); 544 - return (resp_save == NULL); 544 + return resp_save == NULL; 545 545 } 546 546 547 547 static inline int
+2 -2
drivers/net/usb/sierra_net.c
··· 203 203 /* is packet IPv4 */ 204 204 static inline int is_ip(struct sk_buff *skb) 205 205 { 206 - return (skb->protocol == cpu_to_be16(ETH_P_IP)); 206 + return skb->protocol == cpu_to_be16(ETH_P_IP); 207 207 } 208 208 209 209 /* ··· 354 354 355 355 static inline int sierra_net_is_valid_addrlen(u8 len) 356 356 { 357 - return (len == sizeof(struct in_addr)); 357 + return len == sizeof(struct in_addr); 358 358 } 359 359 360 360 static int sierra_net_parse_lsi(struct usbnet *dev, char *data, int datalen)
+1 -1
drivers/net/veth.c
··· 250 250 251 251 static int is_valid_veth_mtu(int new_mtu) 252 252 { 253 - return (new_mtu >= MIN_MTU && new_mtu <= MAX_MTU); 253 + return new_mtu >= MIN_MTU && new_mtu <= MAX_MTU; 254 254 } 255 255 256 256 static int veth_change_mtu(struct net_device *dev, int new_mtu)
+21 -21
drivers/net/wan/dlci.c
··· 97 97 98 98 dest = skb_push(skb, hlen); 99 99 if (!dest) 100 - return(0); 100 + return 0; 101 101 102 102 memcpy(dest, &hdr, hlen); 103 103 104 - return(hlen); 104 + return hlen; 105 105 } 106 106 107 107 static void dlci_receive(struct sk_buff *skb, struct net_device *dev) ··· 211 211 if (copy_from_user(&config, conf, sizeof(struct dlci_conf))) 212 212 return -EFAULT; 213 213 if (config.flags & ~DLCI_VALID_FLAGS) 214 - return(-EINVAL); 214 + return -EINVAL; 215 215 memcpy(&dlp->config, &config, sizeof(struct dlci_conf)); 216 216 dlp->configured = 1; 217 217 } 218 218 219 219 err = (*flp->dlci_conf)(dlp->slave, dev, get); 220 220 if (err) 221 - return(err); 221 + return err; 222 222 223 223 if (get) 224 224 { ··· 226 226 return -EFAULT; 227 227 } 228 228 229 - return(0); 229 + return 0; 230 230 } 231 231 232 232 static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ··· 234 234 struct dlci_local *dlp; 235 235 236 236 if (!capable(CAP_NET_ADMIN)) 237 - return(-EPERM); 237 + return -EPERM; 238 238 239 239 dlp = netdev_priv(dev); 240 240 ··· 242 242 { 243 243 case DLCI_GET_SLAVE: 244 244 if (!*(short *)(dev->dev_addr)) 245 - return(-EINVAL); 245 + return -EINVAL; 246 246 247 247 strncpy(ifr->ifr_slave, dlp->slave->name, sizeof(ifr->ifr_slave)); 248 248 break; ··· 250 250 case DLCI_GET_CONF: 251 251 case DLCI_SET_CONF: 252 252 if (!*(short *)(dev->dev_addr)) 253 - return(-EINVAL); 253 + return -EINVAL; 254 254 255 - return(dlci_config(dev, ifr->ifr_data, cmd == DLCI_GET_CONF)); 255 + return dlci_config(dev, ifr->ifr_data, cmd == DLCI_GET_CONF); 256 256 break; 257 257 258 258 default: 259 - return(-EOPNOTSUPP); 259 + return -EOPNOTSUPP; 260 260 } 261 - return(0); 261 + return 0; 262 262 } 263 263 264 264 static int dlci_change_mtu(struct net_device *dev, int new_mtu) ··· 277 277 dlp = netdev_priv(dev); 278 278 279 279 if (!*(short *)(dev->dev_addr)) 280 - return(-EINVAL); 280 + return -EINVAL; 281 281 282 282 if (!netif_running(dlp->slave)) 283 - return(-ENOTCONN); 283 + return -ENOTCONN; 284 284 285 285 flp = netdev_priv(dlp->slave); 286 286 err = (*flp->activate)(dlp->slave, dev); 287 287 if (err) 288 - return(err); 288 + return err; 289 289 290 290 netif_start_queue(dev); 291 291 ··· 365 365 list_add(&dlp->list, &dlci_devs); 366 366 rtnl_unlock(); 367 367 368 - return(0); 368 + return 0; 369 369 370 370 err2: 371 371 rtnl_unlock(); 372 372 free_netdev(master); 373 373 err1: 374 374 dev_put(slave); 375 - return(err); 375 + return err; 376 376 } 377 377 378 378 static int dlci_del(struct dlci_add *dlci) ··· 385 385 /* validate slave device */ 386 386 master = __dev_get_by_name(&init_net, dlci->devname); 387 387 if (!master) 388 - return(-ENODEV); 388 + return -ENODEV; 389 389 390 390 if (netif_running(master)) { 391 - return(-EBUSY); 391 + return -EBUSY; 392 392 } 393 393 394 394 dlp = netdev_priv(master); ··· 406 406 } 407 407 rtnl_unlock(); 408 408 409 - return(err); 409 + return err; 410 410 } 411 411 412 412 static int dlci_ioctl(unsigned int cmd, void __user *arg) ··· 415 415 int err; 416 416 417 417 if (!capable(CAP_NET_ADMIN)) 418 - return(-EPERM); 418 + return -EPERM; 419 419 420 420 if (copy_from_user(&add, arg, sizeof(struct dlci_add))) 421 421 return -EFAULT; ··· 438 438 err = -EINVAL; 439 439 } 440 440 441 - return(err); 441 + return err; 442 442 } 443 443 444 444 static const struct header_ops dlci_header_ops = {
+2 -2
drivers/net/wan/lmc/lmc_main.c
··· 1022 1022 1023 1023 if (sc->lmc_ok){ 1024 1024 lmc_trace(dev, "lmc_open lmc_ok out"); 1025 - return (0); 1025 + return 0; 1026 1026 } 1027 1027 1028 1028 lmc_softreset (sc); ··· 1110 1110 1111 1111 lmc_trace(dev, "lmc_open out"); 1112 1112 1113 - return (0); 1113 + return 0; 1114 1114 } 1115 1115 1116 1116 /* Total reset to compensate for the AdTran DSU doing bad things
+2 -2
drivers/net/wan/n2.c
··· 379 379 if (request_irq(irq, sca_intr, 0, devname, card)) { 380 380 printk(KERN_ERR "n2: could not allocate IRQ\n"); 381 381 n2_destroy_card(card); 382 - return(-EBUSY); 382 + return -EBUSY; 383 383 } 384 384 card->irq = irq; 385 385 386 386 if (!request_mem_region(winbase, USE_WINDOWSIZE, devname)) { 387 387 printk(KERN_ERR "n2: could not request RAM window\n"); 388 388 n2_destroy_card(card); 389 - return(-EBUSY); 389 + return -EBUSY; 390 390 } 391 391 card->phy_winbase = winbase; 392 392 card->winbase = ioremap(winbase, USE_WINDOWSIZE);
+9 -9
drivers/net/wan/pc300_drv.c
··· 451 451 if ((status & DST_EOM) || (first_bd == card->chan[ch].rx_last_bd)) { 452 452 /* Return the size of a good frame or incomplete bad frame 453 453 * (dma_buf_read will clean the buffer descriptors in this case). */ 454 - return (rcvd); 454 + return rcvd; 455 455 } 456 456 ptdescr = (card->hw.rambase + cpc_readl(&ptdescr->next)); 457 457 } 458 - return (-1); 458 + return -1; 459 459 } 460 460 461 461 /* ··· 557 557 cpc_writel(card->hw.scabase + DRX_REG(EDAL, ch), 558 558 RX_BD_ADDR(ch, chan->rx_last_bd)); 559 559 } 560 - return (rcvd); 560 + return rcvd; 561 561 } 562 562 563 563 static void tx_dma_stop(pc300_t * card, int ch) ··· 1733 1733 pc300ch_t *chan = (pc300ch_t *) & card->chan[ch]; 1734 1734 falc_t *pfalc = (falc_t *) & chan->falc; 1735 1735 1736 - return (pfalc->bec); 1736 + return pfalc->bec; 1737 1737 } 1738 1738 1739 1739 /**********************************/ ··· 2819 2819 *br_io = 0; 2820 2820 2821 2821 if (rate == 0) 2822 - return (0); 2822 + return 0; 2823 2823 2824 2824 for (br = 0, br_pwr = 1; br <= 9; br++, br_pwr <<= 1) { 2825 2825 if ((tc = clock / br_pwr / rate) <= 0xff) { ··· 2832 2832 error = ((rate - (clock / br_pwr / rate)) / rate) * 1000; 2833 2833 /* Errors bigger than +/- 1% won't be tolerated */ 2834 2834 if (error < -10 || error > 10) 2835 - return (-1); 2835 + return -1; 2836 2836 else 2837 - return (tc); 2837 + return tc; 2838 2838 } else { 2839 - return (-1); 2839 + return -1; 2840 2840 } 2841 2841 } 2842 2842 ··· 3207 3207 break; 3208 3208 } 3209 3209 } 3210 - return (i); 3210 + return i; 3211 3211 } 3212 3212 3213 3213 static void plx_init(pc300_t * card)
+1 -1
drivers/net/wan/pc300_tty.c
··· 540 540 return -ENODEV; 541 541 } 542 542 543 - return(0); 543 + return 0; 544 544 } 545 545 546 546 static int pc300_tiocmset(struct tty_struct *tty, struct file *file,
+54 -54
drivers/net/wan/sdla.c
··· 178 178 byte = *temp; 179 179 spin_unlock_irqrestore(&sdla_lock, flags); 180 180 181 - return(byte); 181 + return byte; 182 182 } 183 183 184 184 static void sdla_stop(struct net_device *dev) ··· 267 267 resp = *temp; 268 268 } 269 269 } 270 - return(time_before(jiffies, done) ? jiffies - start : -1); 270 + return time_before(jiffies, done) ? jiffies - start : -1; 271 271 } 272 272 273 273 /* constants for Z80 CPU speed */ ··· 283 283 284 284 sdla_start(dev); 285 285 if (sdla_z80_poll(dev, 0, 3*HZ, Z80_READY, 0) < 0) 286 - return(-EIO); 286 + return -EIO; 287 287 288 288 data = LOADER_READY; 289 289 sdla_write(dev, 0, &data, 1); 290 290 291 291 if ((jiffs = sdla_z80_poll(dev, 0, 8*HZ, Z80_SCC_OK, Z80_SCC_BAD)) < 0) 292 - return(-EIO); 292 + return -EIO; 293 293 294 294 sdla_stop(dev); 295 295 sdla_read(dev, 0, &data, 1); ··· 297 297 if (data == Z80_SCC_BAD) 298 298 { 299 299 printk("%s: SCC bad\n", dev->name); 300 - return(-EIO); 300 + return -EIO; 301 301 } 302 302 303 303 if (data != Z80_SCC_OK) 304 - return(-EINVAL); 304 + return -EINVAL; 305 305 306 306 if (jiffs < 165) 307 307 ifr->ifr_mtu = SDLA_CPU_16M; ··· 316 316 else 317 317 ifr->ifr_mtu = SDLA_CPU_3M; 318 318 319 - return(0); 319 + return 0; 320 320 } 321 321 322 322 /************************************************ ··· 493 493 if (ret != SDLA_RET_OK) 494 494 sdla_errors(dev, cmd, dlci, ret, len, &status); 495 495 496 - return(ret); 496 + return ret; 497 497 } 498 498 499 499 /*********************************************** ··· 516 516 break; 517 517 518 518 if (i == CONFIG_DLCI_MAX) 519 - return(-ENODEV); 519 + return -ENODEV; 520 520 521 521 flp->dlci[i] = abs(flp->dlci[i]); 522 522 523 523 if (netif_running(slave) && (flp->config.station == FRAD_STATION_NODE)) 524 524 sdla_cmd(slave, SDLA_ACTIVATE_DLCI, 0, 0, &flp->dlci[i], sizeof(short), NULL, NULL); 525 525 526 - return(0); 526 + return 0; 527 527 } 528 528 529 529 static int sdla_deactivate(struct net_device *slave, struct net_device *master) ··· 538 538 break; 539 539 540 540 if (i == CONFIG_DLCI_MAX) 541 - return(-ENODEV); 541 + return -ENODEV; 542 542 543 543 flp->dlci[i] = -abs(flp->dlci[i]); 544 544 545 545 if (netif_running(slave) && (flp->config.station == FRAD_STATION_NODE)) 546 546 sdla_cmd(slave, SDLA_DEACTIVATE_DLCI, 0, 0, &flp->dlci[i], sizeof(short), NULL, NULL); 547 547 548 - return(0); 548 + return 0; 549 549 } 550 550 551 551 static int sdla_assoc(struct net_device *slave, struct net_device *master) ··· 554 554 int i; 555 555 556 556 if (master->type != ARPHRD_DLCI) 557 - return(-EINVAL); 557 + return -EINVAL; 558 558 559 559 flp = netdev_priv(slave); 560 560 ··· 563 563 if (!flp->master[i]) 564 564 break; 565 565 if (abs(flp->dlci[i]) == *(short *)(master->dev_addr)) 566 - return(-EADDRINUSE); 566 + return -EADDRINUSE; 567 567 } 568 568 569 569 if (i == CONFIG_DLCI_MAX) 570 - return(-EMLINK); /* #### Alan: Comments on this ?? */ 570 + return -EMLINK; /* #### Alan: Comments on this ?? */ 571 571 572 572 573 573 flp->master[i] = master; ··· 581 581 sdla_cmd(slave, SDLA_ADD_DLCI, 0, 0, master->dev_addr, sizeof(short), NULL, NULL); 582 582 } 583 583 584 - return(0); 584 + return 0; 585 585 } 586 586 587 587 static int sdla_deassoc(struct net_device *slave, struct net_device *master) ··· 596 596 break; 597 597 598 598 if (i == CONFIG_DLCI_MAX) 599 - return(-ENODEV); 599 + return -ENODEV; 600 600 601 601 flp->master[i] = NULL; 602 602 flp->dlci[i] = 0; ··· 609 609 sdla_cmd(slave, SDLA_DELETE_DLCI, 0, 0, master->dev_addr, sizeof(short), NULL, NULL); 610 610 } 611 611 612 - return(0); 612 + return 0; 613 613 } 614 614 615 615 static int sdla_dlci_conf(struct net_device *slave, struct net_device *master, int get) ··· 626 626 break; 627 627 628 628 if (i == CONFIG_DLCI_MAX) 629 - return(-ENODEV); 629 + return -ENODEV; 630 630 631 631 dlp = netdev_priv(master); 632 632 ··· 641 641 &dlp->config, sizeof(struct dlci_conf) - 4 * sizeof(short), NULL, NULL); 642 642 } 643 643 644 - return(ret == SDLA_RET_OK ? 0 : -EIO); 644 + return ret == SDLA_RET_OK ? 0 : -EIO; 645 645 } 646 646 647 647 /************************** ··· 986 986 987 987 netif_stop_queue(dev); 988 988 989 - return(0); 989 + return 0; 990 990 } 991 991 992 992 struct conf_data { ··· 1006 1006 flp = netdev_priv(dev); 1007 1007 1008 1008 if (!flp->initialized) 1009 - return(-EPERM); 1009 + return -EPERM; 1010 1010 1011 1011 if (!flp->configured) 1012 - return(-EPERM); 1012 + return -EPERM; 1013 1013 1014 1014 /* time to send in the configuration */ 1015 1015 len = 0; ··· 1087 1087 1088 1088 netif_start_queue(dev); 1089 1089 1090 - return(0); 1090 + return 0; 1091 1091 } 1092 1092 1093 1093 static int sdla_config(struct net_device *dev, struct frad_conf __user *conf, int get) ··· 1098 1098 short size; 1099 1099 1100 1100 if (dev->type == 0xFFFF) 1101 - return(-EUNATCH); 1101 + return -EUNATCH; 1102 1102 1103 1103 flp = netdev_priv(dev); 1104 1104 1105 1105 if (!get) 1106 1106 { 1107 1107 if (netif_running(dev)) 1108 - return(-EBUSY); 1108 + return -EBUSY; 1109 1109 1110 1110 if(copy_from_user(&data.config, conf, sizeof(struct frad_conf))) 1111 1111 return -EFAULT; 1112 1112 1113 1113 if (data.config.station & ~FRAD_STATION_NODE) 1114 - return(-EINVAL); 1114 + return -EINVAL; 1115 1115 1116 1116 if (data.config.flags & ~FRAD_VALID_FLAGS) 1117 - return(-EINVAL); 1117 + return -EINVAL; 1118 1118 1119 1119 if ((data.config.kbaud < 0) || 1120 1120 ((data.config.kbaud > 128) && (flp->type != SDLA_S508))) 1121 - return(-EINVAL); 1121 + return -EINVAL; 1122 1122 1123 1123 if (data.config.clocking & ~(FRAD_CLOCK_INT | SDLA_S508_PORT_RS232)) 1124 - return(-EINVAL); 1124 + return -EINVAL; 1125 1125 1126 1126 if ((data.config.mtu < 0) || (data.config.mtu > SDLA_MAX_MTU)) 1127 - return(-EINVAL); 1127 + return -EINVAL; 1128 1128 1129 1129 if ((data.config.T391 < 5) || (data.config.T391 > 30)) 1130 - return(-EINVAL); 1130 + return -EINVAL; 1131 1131 1132 1132 if ((data.config.T392 < 5) || (data.config.T392 > 30)) 1133 - return(-EINVAL); 1133 + return -EINVAL; 1134 1134 1135 1135 if ((data.config.N391 < 1) || (data.config.N391 > 255)) 1136 - return(-EINVAL); 1136 + return -EINVAL; 1137 1137 1138 1138 if ((data.config.N392 < 1) || (data.config.N392 > 10)) 1139 - return(-EINVAL); 1139 + return -EINVAL; 1140 1140 1141 1141 if ((data.config.N393 < 1) || (data.config.N393 > 10)) 1142 - return(-EINVAL); 1142 + return -EINVAL; 1143 1143 1144 1144 memcpy(&flp->config, &data.config, sizeof(struct frad_conf)); 1145 1145 flp->config.flags |= SDLA_DIRECT_RECV; ··· 1171 1171 { 1172 1172 size = sizeof(data); 1173 1173 if (sdla_cmd(dev, SDLA_READ_DLCI_CONFIGURATION, 0, 0, NULL, 0, &data, &size) != SDLA_RET_OK) 1174 - return(-EIO); 1174 + return -EIO; 1175 1175 } 1176 1176 else 1177 1177 if (flp->configured) ··· 1185 1185 return copy_to_user(conf, &data.config, sizeof(struct frad_conf))?-EFAULT:0; 1186 1186 } 1187 1187 1188 - return(0); 1188 + return 0; 1189 1189 } 1190 1190 1191 1191 static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int read) ··· 1200 1200 { 1201 1201 temp = kzalloc(mem.len, GFP_KERNEL); 1202 1202 if (!temp) 1203 - return(-ENOMEM); 1203 + return -ENOMEM; 1204 1204 sdla_read(dev, mem.addr, temp, mem.len); 1205 1205 if(copy_to_user(mem.data, temp, mem.len)) 1206 1206 { ··· 1217 1217 sdla_write(dev, mem.addr, temp, mem.len); 1218 1218 kfree(temp); 1219 1219 } 1220 - return(0); 1220 + return 0; 1221 1221 } 1222 1222 1223 1223 static int sdla_reconfig(struct net_device *dev) ··· 1241 1241 sdla_cmd(dev, SDLA_SET_DLCI_CONFIGURATION, 0, 0, &data, len, NULL, NULL); 1242 1242 sdla_cmd(dev, SDLA_ENABLE_COMMUNICATIONS, 0, 0, NULL, 0, NULL, NULL); 1243 1243 1244 - return(0); 1244 + return 0; 1245 1245 } 1246 1246 1247 1247 static int sdla_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ··· 1254 1254 flp = netdev_priv(dev); 1255 1255 1256 1256 if (!flp->initialized) 1257 - return(-EINVAL); 1257 + return -EINVAL; 1258 1258 1259 1259 switch (cmd) 1260 1260 { 1261 1261 case FRAD_GET_CONF: 1262 1262 case FRAD_SET_CONF: 1263 - return(sdla_config(dev, ifr->ifr_data, cmd == FRAD_GET_CONF)); 1263 + return sdla_config(dev, ifr->ifr_data, cmd == FRAD_GET_CONF); 1264 1264 1265 1265 case SDLA_IDENTIFY: 1266 1266 ifr->ifr_flags = flp->type; 1267 1267 break; 1268 1268 1269 1269 case SDLA_CPUSPEED: 1270 - return(sdla_cpuspeed(dev, ifr)); 1270 + return sdla_cpuspeed(dev, ifr); 1271 1271 1272 1272 /* ========================================================== 1273 1273 NOTE: This is rather a useless action right now, as the ··· 1277 1277 ============================================================*/ 1278 1278 case SDLA_PROTOCOL: 1279 1279 if (flp->configured) 1280 - return(-EALREADY); 1280 + return -EALREADY; 1281 1281 1282 1282 switch (ifr->ifr_flags) 1283 1283 { ··· 1285 1285 dev->type = ifr->ifr_flags; 1286 1286 break; 1287 1287 default: 1288 - return(-ENOPROTOOPT); 1288 + return -ENOPROTOOPT; 1289 1289 } 1290 1290 break; 1291 1291 ··· 1297 1297 case SDLA_READMEM: 1298 1298 if(!capable(CAP_SYS_RAWIO)) 1299 1299 return -EPERM; 1300 - return(sdla_xfer(dev, ifr->ifr_data, cmd == SDLA_READMEM)); 1300 + return sdla_xfer(dev, ifr->ifr_data, cmd == SDLA_READMEM); 1301 1301 1302 1302 case SDLA_START: 1303 1303 sdla_start(dev); ··· 1308 1308 break; 1309 1309 1310 1310 default: 1311 - return(-EOPNOTSUPP); 1311 + return -EOPNOTSUPP; 1312 1312 } 1313 - return(0); 1313 + return 0; 1314 1314 } 1315 1315 1316 1316 static int sdla_change_mtu(struct net_device *dev, int new_mtu) ··· 1320 1320 flp = netdev_priv(dev); 1321 1321 1322 1322 if (netif_running(dev)) 1323 - return(-EBUSY); 1323 + return -EBUSY; 1324 1324 1325 1325 /* for now, you can't change the MTU! */ 1326 - return(-EOPNOTSUPP); 1326 + return -EOPNOTSUPP; 1327 1327 } 1328 1328 1329 1329 static int sdla_set_config(struct net_device *dev, struct ifmap *map) ··· 1337 1337 flp = netdev_priv(dev); 1338 1338 1339 1339 if (flp->initialized) 1340 - return(-EINVAL); 1340 + return -EINVAL; 1341 1341 1342 1342 for(i=0; i < ARRAY_SIZE(valid_port); i++) 1343 1343 if (valid_port[i] == map->base_addr) 1344 1344 break; 1345 1345 1346 1346 if (i == ARRAY_SIZE(valid_port)) 1347 - return(-EINVAL); 1347 + return -EINVAL; 1348 1348 1349 1349 if (!request_region(map->base_addr, SDLA_IO_EXTENTS, dev->name)){ 1350 1350 printk(KERN_WARNING "SDLA: io-port 0x%04lx in use\n", dev->base_addr); 1351 - return(-EINVAL); 1351 + return -EINVAL; 1352 1352 } 1353 1353 base = map->base_addr; 1354 1354
+1 -1
drivers/net/wan/x25_asy.c
··· 648 648 } 649 649 } 650 650 *ptr++ = X25_END; 651 - return (ptr - d); 651 + return ptr - d; 652 652 } 653 653 654 654 static void x25_asy_unesc(struct x25_asy *sl, unsigned char s)
+3 -3
drivers/net/xen-netfront.c
··· 135 135 static int skb_entry_is_link(const union skb_entry *list) 136 136 { 137 137 BUILD_BUG_ON(sizeof(list->skb) != sizeof(list->link)); 138 - return ((unsigned long)list->skb < PAGE_OFFSET); 138 + return (unsigned long)list->skb < PAGE_OFFSET; 139 139 } 140 140 141 141 /* ··· 203 203 204 204 static int netfront_tx_slot_available(struct netfront_info *np) 205 205 { 206 - return ((np->tx.req_prod_pvt - np->tx.rsp_cons) < 207 - (TX_MAX_TARGET - MAX_SKB_FRAGS - 2)); 206 + return (np->tx.req_prod_pvt - np->tx.rsp_cons) < 207 + (TX_MAX_TARGET - MAX_SKB_FRAGS - 2); 208 208 } 209 209 210 210 static void xennet_maybe_wake_tx(struct net_device *dev)