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

encx24j600: Fix some checkstyle warnings

Signed-off-by: Jeroen De Wachter <jeroen.de_wachter.ext@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jeroen De Wachter and committed by
David S. Miller
b822ee6c ebe5236d

+25 -8
+11 -6
drivers/net/ethernet/microchip/encx24j600-regmap.c
··· 26 26 } 27 27 28 28 static int encx24j600_switch_bank(struct encx24j600_context *ctx, 29 - int bank) 29 + int bank) 30 30 { 31 31 int ret = 0; 32 - 33 32 int bank_opcode = BANK_SELECT(bank); 33 + 34 34 ret = spi_write(ctx->spi, &bank_opcode, 1); 35 35 if (ret == 0) 36 36 ctx->bank = bank; ··· 39 39 } 40 40 41 41 static int encx24j600_cmdn(struct encx24j600_context *ctx, u8 opcode, 42 - const void *buf, size_t len) 42 + const void *buf, size_t len) 43 43 { 44 44 struct spi_message m; 45 45 struct spi_transfer t[2] = { { .tx_buf = &opcode, .len = 1, }, ··· 54 54 static void regmap_lock_mutex(void *context) 55 55 { 56 56 struct encx24j600_context *ctx = context; 57 + 57 58 mutex_lock(&ctx->mutex); 58 59 } 59 60 60 61 static void regmap_unlock_mutex(void *context) 61 62 { 62 63 struct encx24j600_context *ctx = context; 64 + 63 65 mutex_unlock(&ctx->mutex); 64 66 } 65 67 ··· 130 128 131 129 if (reg < 0x80) { 132 130 int ret = 0; 131 + 133 132 cmd = banked_code | banked_reg; 134 133 if ((banked_reg < 0x16) && (ctx->bank != bank)) 135 134 ret = encx24j600_switch_bank(ctx, bank); ··· 177 174 size_t len) 178 175 { 179 176 struct encx24j600_context *ctx = context; 177 + 180 178 return regmap_encx24j600_sfr_update(ctx, reg, val, len, WCRU, WCRCODE); 181 179 } 182 180 ··· 232 228 233 229 if (reg < 0xc0) 234 230 return encx24j600_cmdn(ctx, reg, data, count); 235 - else 236 - /* SPI 1-byte command. Ignore data */ 237 - return spi_write(ctx->spi, &reg, 1); 231 + 232 + /* SPI 1-byte command. Ignore data */ 233 + return spi_write(ctx->spi, &reg, 1); 238 234 } 239 235 EXPORT_SYMBOL_GPL(regmap_encx24j600_spi_write); 240 236 ··· 499 495 .writeable_reg = encx24j600_phymap_writeable, 500 496 .volatile_reg = encx24j600_phymap_volatile, 501 497 }; 498 + 502 499 static struct regmap_bus phymap_encx24j600 = { 503 500 .reg_write = regmap_encx24j600_phy_reg_write, 504 501 .reg_read = regmap_encx24j600_phy_reg_read,
+14 -2
drivers/net/ethernet/microchip/encx24j600.c
··· 30 30 31 31 #define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK) 32 32 static int debug = -1; 33 - module_param(debug, int, 0); 33 + module_param(debug, int, 0000); 34 34 MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)"); 35 35 36 36 /* SRAM memory layout: ··· 105 105 struct net_device *dev = priv->ndev; 106 106 unsigned int val = 0; 107 107 int ret = regmap_read(priv->ctx.regmap, reg, &val); 108 + 108 109 if (unlikely(ret)) 109 110 netif_err(priv, drv, dev, "%s: error %d reading reg %02x\n", 110 111 __func__, ret, reg); ··· 116 115 { 117 116 struct net_device *dev = priv->ndev; 118 117 int ret = regmap_write(priv->ctx.regmap, reg, val); 118 + 119 119 if (unlikely(ret)) 120 120 netif_err(priv, drv, dev, "%s: error %d writing reg %02x=%04x\n", 121 121 __func__, ret, reg, val); ··· 127 125 { 128 126 struct net_device *dev = priv->ndev; 129 127 int ret = regmap_update_bits(priv->ctx.regmap, reg, mask, val); 128 + 130 129 if (unlikely(ret)) 131 130 netif_err(priv, drv, dev, "%s: error %d updating reg %02x=%04x~%04x\n", 132 131 __func__, ret, reg, val, mask); ··· 138 135 struct net_device *dev = priv->ndev; 139 136 unsigned int val = 0; 140 137 int ret = regmap_read(priv->ctx.phymap, reg, &val); 138 + 141 139 if (unlikely(ret)) 142 140 netif_err(priv, drv, dev, "%s: error %d reading %02x\n", 143 141 __func__, ret, reg); ··· 149 145 { 150 146 struct net_device *dev = priv->ndev; 151 147 int ret = regmap_write(priv->ctx.phymap, reg, val); 148 + 152 149 if (unlikely(ret)) 153 150 netif_err(priv, drv, dev, "%s: error %d writing reg %02x=%04x\n", 154 151 __func__, ret, reg, val); ··· 169 164 { 170 165 struct net_device *dev = priv->ndev; 171 166 int ret = regmap_write(priv->ctx.regmap, cmd, 0); 167 + 172 168 if (unlikely(ret)) 173 169 netif_err(priv, drv, dev, "%s: error %d with cmd %02x\n", 174 170 __func__, ret, cmd); ··· 179 173 size_t count) 180 174 { 181 175 int ret; 176 + 182 177 mutex_lock(&priv->ctx.mutex); 183 178 ret = regmap_encx24j600_spi_read(&priv->ctx, reg, data, count); 184 179 mutex_unlock(&priv->ctx.mutex); ··· 191 184 const u8 *data, size_t count) 192 185 { 193 186 int ret; 187 + 194 188 mutex_lock(&priv->ctx.mutex); 195 189 ret = regmap_encx24j600_spi_write(&priv->ctx, reg, data, count); 196 190 mutex_unlock(&priv->ctx.mutex); ··· 202 194 static void encx24j600_update_phcon1(struct encx24j600_priv *priv) 203 195 { 204 196 u16 phcon1 = encx24j600_read_phy(priv, PHCON1); 197 + 205 198 if (priv->autoneg == AUTONEG_ENABLE) { 206 199 phcon1 |= ANEN | RENEG; 207 200 } else { ··· 337 328 { 338 329 struct net_device *dev = priv->ndev; 339 330 struct sk_buff *skb = netdev_alloc_skb(dev, rsv->len + NET_IP_ALIGN); 331 + 340 332 if (!skb) { 341 333 pr_err_ratelimited("RX: OOM: packet dropped\n"); 342 334 dev->stats.rx_dropped++; ··· 838 828 static void encx24j600_hw_tx(struct encx24j600_priv *priv) 839 829 { 840 830 struct net_device *dev = priv->ndev; 831 + 841 832 netif_info(priv, tx_queued, dev, "TX Packet Len:%d\n", 842 833 priv->tx_skb->len); 843 834 ··· 906 895 907 896 dev->stats.tx_errors++; 908 897 netif_wake_queue(dev); 909 - return; 910 898 } 911 899 912 900 static int encx24j600_get_regs_len(struct net_device *dev) ··· 968 958 static u32 encx24j600_get_msglevel(struct net_device *dev) 969 959 { 970 960 struct encx24j600_priv *priv = netdev_priv(dev); 961 + 971 962 return priv->msg_enable; 972 963 } 973 964 974 965 static void encx24j600_set_msglevel(struct net_device *dev, u32 val) 975 966 { 976 967 struct encx24j600_priv *priv = netdev_priv(dev); 968 + 977 969 priv->msg_enable = val; 978 970 } 979 971