diff options
| author | Bilel DRIRA <bilel.dr@gmail.com> | 2015-02-03 15:26:27 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-07 04:37:52 -0500 |
| commit | 9b1af46b3ae1880f7ab7b1f1598b4daf2ddec8e4 (patch) | |
| tree | 8b69a1bc21a56c0cf6e906e745a71e353e18a4d7 | |
| parent | c4d507677fe0913cb4f14338b990ae8229d37940 (diff) | |
staging: ft1000: fix braces warning
This patch fix checkpatch.pl WARNING:
WARNING: braces {} are not necessary for single statement blocks
Signed-off-by: Bilel DRIRA <bilel.dr@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 73 |
1 files changed, 29 insertions, 44 deletions
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c index 5e0cdcf26180..017c3b92f51b 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | |||
| @@ -204,11 +204,11 @@ static inline void ft1000_write_dpram_mag_16(struct net_device *dev, | |||
| 204 | /* Provide mutual exclusive access while reading ASIC registers. */ | 204 | /* Provide mutual exclusive access while reading ASIC registers. */ |
| 205 | spin_lock_irqsave(&info->dpram_lock, flags); | 205 | spin_lock_irqsave(&info->dpram_lock, flags); |
| 206 | ft1000_write_reg(dev, FT1000_REG_DPRAM_ADDR, offset); | 206 | ft1000_write_reg(dev, FT1000_REG_DPRAM_ADDR, offset); |
| 207 | if (Index) { | 207 | if (Index) |
| 208 | ft1000_write_reg(dev, FT1000_REG_MAG_DPDATAL, value); | 208 | ft1000_write_reg(dev, FT1000_REG_MAG_DPDATAL, value); |
| 209 | } else { | 209 | else |
| 210 | ft1000_write_reg(dev, FT1000_REG_MAG_DPDATAH, value); | 210 | ft1000_write_reg(dev, FT1000_REG_MAG_DPDATAH, value); |
| 211 | } | 211 | |
| 212 | spin_unlock_irqrestore(&info->dpram_lock, flags); | 212 | spin_unlock_irqrestore(&info->dpram_lock, flags); |
| 213 | } | 213 | } |
| 214 | 214 | ||
| @@ -440,9 +440,8 @@ static int ft1000_reset_card(struct net_device *dev) | |||
| 440 | tempword = | 440 | tempword = |
| 441 | ft1000_read_dpram_mag_16(dev, FT1000_MAG_DPRAM_FEFE, | 441 | ft1000_read_dpram_mag_16(dev, FT1000_MAG_DPRAM_FEFE, |
| 442 | FT1000_MAG_DPRAM_FEFE_INDX); | 442 | FT1000_MAG_DPRAM_FEFE_INDX); |
| 443 | if (tempword == 0xfefe) { | 443 | if (tempword == 0xfefe) |
| 444 | break; | 444 | break; |
| 445 | } | ||
| 446 | mdelay(20); | 445 | mdelay(20); |
| 447 | } | 446 | } |
| 448 | 447 | ||
| @@ -621,9 +620,9 @@ static void ft1000_hbchk(u_long data) | |||
| 621 | 620 | ||
| 622 | tempword = ft1000_read_reg(dev, FT1000_REG_DOORBELL); | 621 | tempword = ft1000_read_reg(dev, FT1000_REG_DOORBELL); |
| 623 | /* Let's check doorbell again if fail */ | 622 | /* Let's check doorbell again if fail */ |
| 624 | if (tempword & FT1000_DB_HB) { | 623 | if (tempword & FT1000_DB_HB) |
| 625 | tempword = ft1000_read_reg(dev, FT1000_REG_DOORBELL); | 624 | tempword = ft1000_read_reg(dev, FT1000_REG_DOORBELL); |
| 626 | } | 625 | |
| 627 | if (tempword & FT1000_DB_HB) { | 626 | if (tempword & FT1000_DB_HB) { |
| 628 | pr_info("heartbeat doorbell not clear by firmware\n"); | 627 | pr_info("heartbeat doorbell not clear by firmware\n"); |
| 629 | if (info->AsicID == ELECTRABUZZ_ID) { | 628 | if (info->AsicID == ELECTRABUZZ_ID) { |
| @@ -766,9 +765,8 @@ static void ft1000_send_cmd(struct net_device *dev, u16 *ptempbuffer, int size, | |||
| 766 | 765 | ||
| 767 | size += sizeof(struct pseudo_hdr); | 766 | size += sizeof(struct pseudo_hdr); |
| 768 | /* check for odd byte and increment to 16-bit word align value */ | 767 | /* check for odd byte and increment to 16-bit word align value */ |
| 769 | if ((size & 0x0001)) { | 768 | if ((size & 0x0001)) |
| 770 | size++; | 769 | size++; |
| 771 | } | ||
| 772 | pr_debug("total length = %d\n", size); | 770 | pr_debug("total length = %d\n", size); |
| 773 | pr_debug("length = %d\n", ntohs(*ptempbuffer)); | 771 | pr_debug("length = %d\n", ntohs(*ptempbuffer)); |
| 774 | /* | 772 | /* |
| @@ -911,9 +909,8 @@ static bool ft1000_receive_cmd(struct net_device *dev, u16 *pbuffer, | |||
| 911 | * Calculate pseudo header checksum | 909 | * Calculate pseudo header checksum |
| 912 | */ | 910 | */ |
| 913 | tempword = *ppseudohdr++; | 911 | tempword = *ppseudohdr++; |
| 914 | for (i = 1; i < 7; i++) { | 912 | for (i = 1; i < 7; i++) |
| 915 | tempword ^= *ppseudohdr++; | 913 | tempword ^= *ppseudohdr++; |
| 916 | } | ||
| 917 | if ((tempword != *ppseudohdr)) { | 914 | if ((tempword != *ppseudohdr)) { |
| 918 | pr_debug("Pseudo header checksum mismatch\n"); | 915 | pr_debug("Pseudo header checksum mismatch\n"); |
| 919 | /* Drop this message */ | 916 | /* Drop this message */ |
| @@ -977,9 +974,8 @@ static void ft1000_proc_drvmsg(struct net_device *dev) | |||
| 977 | while (tempword & FT1000_DB_DPRAM_TX) { | 974 | while (tempword & FT1000_DB_DPRAM_TX) { |
| 978 | mdelay(5); | 975 | mdelay(5); |
| 979 | i++; | 976 | i++; |
| 980 | if (i == 10) { | 977 | if (i == 10) |
| 981 | break; | 978 | break; |
| 982 | } | ||
| 983 | } | 979 | } |
| 984 | ptr = | 980 | ptr = |
| 985 | list_entry(info->prov_list.next, | 981 | list_entry(info->prov_list.next, |
| @@ -1099,9 +1095,8 @@ static void ft1000_proc_drvmsg(struct net_device *dev) | |||
| 1099 | mdelay(10); | 1095 | mdelay(10); |
| 1100 | tempword = | 1096 | tempword = |
| 1101 | ft1000_read_reg(dev, FT1000_REG_DOORBELL); | 1097 | ft1000_read_reg(dev, FT1000_REG_DOORBELL); |
| 1102 | if (tempword & FT1000_DB_DPRAM_TX) { | 1098 | if (tempword & FT1000_DB_DPRAM_TX) |
| 1103 | mdelay(10); | 1099 | mdelay(10); |
| 1104 | } | ||
| 1105 | } | 1100 | } |
| 1106 | 1101 | ||
| 1107 | if ((tempword & FT1000_DB_DPRAM_TX) == 0) { | 1102 | if ((tempword & FT1000_DB_DPRAM_TX) == 0) { |
| @@ -1128,9 +1123,9 @@ static void ft1000_proc_drvmsg(struct net_device *dev) | |||
| 1128 | ppseudo_hdr->portsrc = 0; | 1123 | ppseudo_hdr->portsrc = 0; |
| 1129 | /* Calculate new checksum */ | 1124 | /* Calculate new checksum */ |
| 1130 | ppseudo_hdr->checksum = *pmsg++; | 1125 | ppseudo_hdr->checksum = *pmsg++; |
| 1131 | for (i = 1; i < 7; i++) { | 1126 | for (i = 1; i < 7; i++) |
| 1132 | ppseudo_hdr->checksum ^= *pmsg++; | 1127 | ppseudo_hdr->checksum ^= *pmsg++; |
| 1133 | } | 1128 | |
| 1134 | info->DSPInfoBlk[8] = 0x7200; | 1129 | info->DSPInfoBlk[8] = 0x7200; |
| 1135 | info->DSPInfoBlk[9] = | 1130 | info->DSPInfoBlk[9] = |
| 1136 | htons(info->DSPInfoBlklen); | 1131 | htons(info->DSPInfoBlklen); |
| @@ -1150,9 +1145,8 @@ static void ft1000_proc_drvmsg(struct net_device *dev) | |||
| 1150 | mdelay(10); | 1145 | mdelay(10); |
| 1151 | tempword = | 1146 | tempword = |
| 1152 | ft1000_read_reg(dev, FT1000_REG_DOORBELL); | 1147 | ft1000_read_reg(dev, FT1000_REG_DOORBELL); |
| 1153 | if (tempword & FT1000_DB_DPRAM_TX) { | 1148 | if (tempword & FT1000_DB_DPRAM_TX) |
| 1154 | mdelay(10); | 1149 | mdelay(10); |
| 1155 | } | ||
| 1156 | } | 1150 | } |
| 1157 | 1151 | ||
| 1158 | if ((tempword & FT1000_DB_DPRAM_TX) == 0) { | 1152 | if ((tempword & FT1000_DB_DPRAM_TX) == 0) { |
| @@ -1178,9 +1172,9 @@ static void ft1000_proc_drvmsg(struct net_device *dev) | |||
| 1178 | ppseudo_hdr->portsrc = 0; | 1172 | ppseudo_hdr->portsrc = 0; |
| 1179 | /* Calculate new checksum */ | 1173 | /* Calculate new checksum */ |
| 1180 | ppseudo_hdr->checksum = *pmsg++; | 1174 | ppseudo_hdr->checksum = *pmsg++; |
| 1181 | for (i = 1; i < 7; i++) { | 1175 | for (i = 1; i < 7; i++) |
| 1182 | ppseudo_hdr->checksum ^= *pmsg++; | 1176 | ppseudo_hdr->checksum ^= *pmsg++; |
| 1183 | } | 1177 | |
| 1184 | pmsg = (u16 *)&tempbuffer[16]; | 1178 | pmsg = (u16 *)&tempbuffer[16]; |
| 1185 | *pmsg++ = htons(RSP_DRV_ERR_RPT_MSG); | 1179 | *pmsg++ = htons(RSP_DRV_ERR_RPT_MSG); |
| 1186 | *pmsg++ = htons(0x000e); | 1180 | *pmsg++ = htons(0x000e); |
| @@ -1502,9 +1496,8 @@ static void ft1000_flush_fifo(struct net_device *dev, u16 DrvErrNum) | |||
| 1502 | tempword = inw(dev->base_addr + FT1000_REG_MAG_DFSR); | 1496 | tempword = inw(dev->base_addr + FT1000_REG_MAG_DFSR); |
| 1503 | pr_debug("FT1000_REG_MAG_DFSR = 0x%x\n", tempword); | 1497 | pr_debug("FT1000_REG_MAG_DFSR = 0x%x\n", tempword); |
| 1504 | } | 1498 | } |
| 1505 | if (DrvErrNum) { | 1499 | if (DrvErrNum) |
| 1506 | pcmcia->PktIntfErr++; | 1500 | pcmcia->PktIntfErr++; |
| 1507 | } | ||
| 1508 | } | 1501 | } |
| 1509 | } | 1502 | } |
| 1510 | 1503 | ||
| @@ -1561,9 +1554,9 @@ static int ft1000_copy_up_pkt(struct net_device *dev) | |||
| 1561 | if (skb == NULL) { | 1554 | if (skb == NULL) { |
| 1562 | pr_debug("No Network buffers available\n"); | 1555 | pr_debug("No Network buffers available\n"); |
| 1563 | /* Read High word to complete 32 bit access */ | 1556 | /* Read High word to complete 32 bit access */ |
| 1564 | if (info->AsicID == MAGNEMITE_ID) { | 1557 | if (info->AsicID == MAGNEMITE_ID) |
| 1565 | tempword = ft1000_read_reg(dev, FT1000_REG_MAG_DFRH); | 1558 | tempword = ft1000_read_reg(dev, FT1000_REG_MAG_DFRH); |
| 1566 | } | 1559 | |
| 1567 | ft1000_flush_fifo(dev, 0); | 1560 | ft1000_flush_fifo(dev, 0); |
| 1568 | info->stats.rx_errors++; | 1561 | info->stats.rx_errors++; |
| 1569 | return FAILURE; | 1562 | return FAILURE; |
| @@ -1667,9 +1660,8 @@ static int ft1000_copy_up_pkt(struct net_device *dev) | |||
| 1667 | } | 1660 | } |
| 1668 | 1661 | ||
| 1669 | pr_debug("Data passed to Protocol layer:\n"); | 1662 | pr_debug("Data passed to Protocol layer:\n"); |
| 1670 | for (i = 0; i < len + 12; i++) { | 1663 | for (i = 0; i < len + 12; i++) |
| 1671 | pr_debug("Protocol Data: 0x%x\n", *ptemp++); | 1664 | pr_debug("Protocol Data: 0x%x\n", *ptemp++); |
| 1672 | } | ||
| 1673 | 1665 | ||
| 1674 | skb->dev = dev; | 1666 | skb->dev = dev; |
| 1675 | skb->protocol = eth_type_trans(skb, dev); | 1667 | skb->protocol = eth_type_trans(skb, dev); |
| @@ -1723,21 +1715,16 @@ static int ft1000_copy_down_pkt(struct net_device *dev, u16 *packet, u16 len) | |||
| 1723 | /* Check if there is room on the FIFO */ | 1715 | /* Check if there is room on the FIFO */ |
| 1724 | if (len > ft1000_read_fifo_len(dev)) { | 1716 | if (len > ft1000_read_fifo_len(dev)) { |
| 1725 | udelay(10); | 1717 | udelay(10); |
| 1726 | if (len > ft1000_read_fifo_len(dev)) { | 1718 | if (len > ft1000_read_fifo_len(dev)) |
| 1727 | udelay(20); | 1719 | udelay(20); |
| 1728 | } | 1720 | if (len > ft1000_read_fifo_len(dev)) |
| 1729 | if (len > ft1000_read_fifo_len(dev)) { | ||
| 1730 | udelay(20); | 1721 | udelay(20); |
| 1731 | } | 1722 | if (len > ft1000_read_fifo_len(dev)) |
| 1732 | if (len > ft1000_read_fifo_len(dev)) { | ||
| 1733 | udelay(20); | 1723 | udelay(20); |
| 1734 | } | 1724 | if (len > ft1000_read_fifo_len(dev)) |
| 1735 | if (len > ft1000_read_fifo_len(dev)) { | ||
| 1736 | udelay(20); | 1725 | udelay(20); |
| 1737 | } | 1726 | if (len > ft1000_read_fifo_len(dev)) |
| 1738 | if (len > ft1000_read_fifo_len(dev)) { | ||
| 1739 | udelay(20); | 1727 | udelay(20); |
| 1740 | } | ||
| 1741 | if (len > ft1000_read_fifo_len(dev)) { | 1728 | if (len > ft1000_read_fifo_len(dev)) { |
| 1742 | pr_debug("Transmit FIFO is full - pkt drop\n"); | 1729 | pr_debug("Transmit FIFO is full - pkt drop\n"); |
| 1743 | info->stats.tx_errors++; | 1730 | info->stats.tx_errors++; |
| @@ -1745,11 +1732,11 @@ static int ft1000_copy_down_pkt(struct net_device *dev, u16 *packet, u16 len) | |||
| 1745 | } | 1732 | } |
| 1746 | } | 1733 | } |
| 1747 | /* Create pseudo header and send pseudo/ip to hardware */ | 1734 | /* Create pseudo header and send pseudo/ip to hardware */ |
| 1748 | if (info->AsicID == ELECTRABUZZ_ID) { | 1735 | if (info->AsicID == ELECTRABUZZ_ID) |
| 1749 | pseudo.blk.length = len; | 1736 | pseudo.blk.length = len; |
| 1750 | } else { | 1737 | else |
| 1751 | pseudo.blk.length = ntohs(len); | 1738 | pseudo.blk.length = ntohs(len); |
| 1752 | } | 1739 | |
| 1753 | pseudo.blk.source = DSPID; /* Need to swap to get in correct order */ | 1740 | pseudo.blk.source = DSPID; /* Need to swap to get in correct order */ |
| 1754 | pseudo.blk.destination = HOSTID; | 1741 | pseudo.blk.destination = HOSTID; |
| 1755 | pseudo.blk.portdest = NETWORKID; /* Need to swap to get in correct order */ | 1742 | pseudo.blk.portdest = NETWORKID; /* Need to swap to get in correct order */ |
| @@ -1762,9 +1749,8 @@ static int ft1000_copy_down_pkt(struct net_device *dev, u16 *packet, u16 len) | |||
| 1762 | pseudo.blk.qos_class = 0; | 1749 | pseudo.blk.qos_class = 0; |
| 1763 | /* Calculate pseudo header checksum */ | 1750 | /* Calculate pseudo header checksum */ |
| 1764 | pseudo.blk.checksum = pseudo.buff[0]; | 1751 | pseudo.blk.checksum = pseudo.buff[0]; |
| 1765 | for (i = 1; i < 7; i++) { | 1752 | for (i = 1; i < 7; i++) |
| 1766 | pseudo.blk.checksum ^= pseudo.buff[i]; | 1753 | pseudo.blk.checksum ^= pseudo.buff[i]; |
| 1767 | } | ||
| 1768 | 1754 | ||
| 1769 | /* Production Mode */ | 1755 | /* Production Mode */ |
| 1770 | if (info->AsicID == ELECTRABUZZ_ID) { | 1756 | if (info->AsicID == ELECTRABUZZ_ID) { |
| @@ -1829,9 +1815,8 @@ static int ft1000_copy_down_pkt(struct net_device *dev, u16 *packet, u16 len) | |||
| 1829 | 1815 | ||
| 1830 | plong = (u32 *)packet; | 1816 | plong = (u32 *)packet; |
| 1831 | /* Write PPP type + IP Packet into Downlink FIFO */ | 1817 | /* Write PPP type + IP Packet into Downlink FIFO */ |
| 1832 | for (i = 0; i < (len >> 2); i++) { | 1818 | for (i = 0; i < (len >> 2); i++) |
| 1833 | outl(*plong++, dev->base_addr + FT1000_REG_MAG_UFDR); | 1819 | outl(*plong++, dev->base_addr + FT1000_REG_MAG_UFDR); |
| 1834 | } | ||
| 1835 | 1820 | ||
| 1836 | /* Check for odd alignment */ | 1821 | /* Check for odd alignment */ |
| 1837 | if (len & 0x0003) { | 1822 | if (len & 0x0003) { |
