Skip to content

Commit b822ee6

Browse files
Jeroen De Wachterdavem330
Jeroen De Wachter
authored and
davem330
committed
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>
1 parent ebe5236 commit b822ee6

File tree

2 files changed

+25
-8
lines changed

2 files changed

+25
-8
lines changed

‎drivers/net/ethernet/microchip/encx24j600-regmap.c

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ static inline bool is_bits_set(int value, int mask)
2626
}
2727

2828
static int encx24j600_switch_bank(struct encx24j600_context *ctx,
29-
int bank)
29+
int bank)
3030
{
3131
int ret = 0;
32-
3332
int bank_opcode = BANK_SELECT(bank);
33+
3434
ret = spi_write(ctx->spi, &bank_opcode, 1);
3535
if (ret == 0)
3636
ctx->bank = bank;
@@ -39,7 +39,7 @@ static int encx24j600_switch_bank(struct encx24j600_context *ctx,
3939
}
4040

4141
static int encx24j600_cmdn(struct encx24j600_context *ctx, u8 opcode,
42-
const void *buf, size_t len)
42+
const void *buf, size_t len)
4343
{
4444
struct spi_message m;
4545
struct spi_transfer t[2] = { { .tx_buf = &opcode, .len = 1, },
@@ -54,12 +54,14 @@ static int encx24j600_cmdn(struct encx24j600_context *ctx, u8 opcode,
5454
static void regmap_lock_mutex(void *context)
5555
{
5656
struct encx24j600_context *ctx = context;
57+
5758
mutex_lock(&ctx->mutex);
5859
}
5960

6061
static void regmap_unlock_mutex(void *context)
6162
{
6263
struct encx24j600_context *ctx = context;
64+
6365
mutex_unlock(&ctx->mutex);
6466
}
6567

@@ -128,6 +130,7 @@ static int regmap_encx24j600_sfr_update(struct encx24j600_context *ctx,
128130

129131
if (reg < 0x80) {
130132
int ret = 0;
133+
131134
cmd = banked_code | banked_reg;
132135
if ((banked_reg < 0x16) && (ctx->bank != bank))
133136
ret = encx24j600_switch_bank(ctx, bank);
@@ -174,6 +177,7 @@ static int regmap_encx24j600_sfr_write(void *context, u8 reg, u8 *val,
174177
size_t len)
175178
{
176179
struct encx24j600_context *ctx = context;
180+
177181
return regmap_encx24j600_sfr_update(ctx, reg, val, len, WCRU, WCRCODE);
178182
}
179183

@@ -228,9 +232,9 @@ int regmap_encx24j600_spi_write(void *context, u8 reg, const u8 *data,
228232

229233
if (reg < 0xc0)
230234
return encx24j600_cmdn(ctx, reg, data, count);
231-
else
232-
/* SPI 1-byte command. Ignore data */
233-
return spi_write(ctx->spi, &reg, 1);
235+
236+
/* SPI 1-byte command. Ignore data */
237+
return spi_write(ctx->spi, &reg, 1);
234238
}
235239
EXPORT_SYMBOL_GPL(regmap_encx24j600_spi_write);
236240

@@ -495,6 +499,7 @@ static struct regmap_config phycfg = {
495499
.writeable_reg = encx24j600_phymap_writeable,
496500
.volatile_reg = encx24j600_phymap_volatile,
497501
};
502+
498503
static struct regmap_bus phymap_encx24j600 = {
499504
.reg_write = regmap_encx24j600_phy_reg_write,
500505
.reg_read = regmap_encx24j600_phy_reg_read,

‎drivers/net/ethernet/microchip/encx24j600.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK)
3232
static int debug = -1;
33-
module_param(debug, int, 0);
33+
module_param(debug, int, 0000);
3434
MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
3535

3636
/* SRAM memory layout:
@@ -105,6 +105,7 @@ static u16 encx24j600_read_reg(struct encx24j600_priv *priv, u8 reg)
105105
struct net_device *dev = priv->ndev;
106106
unsigned int val = 0;
107107
int ret = regmap_read(priv->ctx.regmap, reg, &val);
108+
108109
if (unlikely(ret))
109110
netif_err(priv, drv, dev, "%s: error %d reading reg %02x\n",
110111
__func__, ret, reg);
@@ -115,6 +116,7 @@ static void encx24j600_write_reg(struct encx24j600_priv *priv, u8 reg, u16 val)
115116
{
116117
struct net_device *dev = priv->ndev;
117118
int ret = regmap_write(priv->ctx.regmap, reg, val);
119+
118120
if (unlikely(ret))
119121
netif_err(priv, drv, dev, "%s: error %d writing reg %02x=%04x\n",
120122
__func__, ret, reg, val);
@@ -125,6 +127,7 @@ static void encx24j600_update_reg(struct encx24j600_priv *priv, u8 reg,
125127
{
126128
struct net_device *dev = priv->ndev;
127129
int ret = regmap_update_bits(priv->ctx.regmap, reg, mask, val);
130+
128131
if (unlikely(ret))
129132
netif_err(priv, drv, dev, "%s: error %d updating reg %02x=%04x~%04x\n",
130133
__func__, ret, reg, val, mask);
@@ -135,6 +138,7 @@ static u16 encx24j600_read_phy(struct encx24j600_priv *priv, u8 reg)
135138
struct net_device *dev = priv->ndev;
136139
unsigned int val = 0;
137140
int ret = regmap_read(priv->ctx.phymap, reg, &val);
141+
138142
if (unlikely(ret))
139143
netif_err(priv, drv, dev, "%s: error %d reading %02x\n",
140144
__func__, ret, reg);
@@ -145,6 +149,7 @@ static void encx24j600_write_phy(struct encx24j600_priv *priv, u8 reg, u16 val)
145149
{
146150
struct net_device *dev = priv->ndev;
147151
int ret = regmap_write(priv->ctx.phymap, reg, val);
152+
148153
if (unlikely(ret))
149154
netif_err(priv, drv, dev, "%s: error %d writing reg %02x=%04x\n",
150155
__func__, ret, reg, val);
@@ -164,6 +169,7 @@ static void encx24j600_cmd(struct encx24j600_priv *priv, u8 cmd)
164169
{
165170
struct net_device *dev = priv->ndev;
166171
int ret = regmap_write(priv->ctx.regmap, cmd, 0);
172+
167173
if (unlikely(ret))
168174
netif_err(priv, drv, dev, "%s: error %d with cmd %02x\n",
169175
__func__, ret, cmd);
@@ -173,6 +179,7 @@ static int encx24j600_raw_read(struct encx24j600_priv *priv, u8 reg, u8 *data,
173179
size_t count)
174180
{
175181
int ret;
182+
176183
mutex_lock(&priv->ctx.mutex);
177184
ret = regmap_encx24j600_spi_read(&priv->ctx, reg, data, count);
178185
mutex_unlock(&priv->ctx.mutex);
@@ -184,6 +191,7 @@ static int encx24j600_raw_write(struct encx24j600_priv *priv, u8 reg,
184191
const u8 *data, size_t count)
185192
{
186193
int ret;
194+
187195
mutex_lock(&priv->ctx.mutex);
188196
ret = regmap_encx24j600_spi_write(&priv->ctx, reg, data, count);
189197
mutex_unlock(&priv->ctx.mutex);
@@ -194,6 +202,7 @@ static int encx24j600_raw_write(struct encx24j600_priv *priv, u8 reg,
194202
static void encx24j600_update_phcon1(struct encx24j600_priv *priv)
195203
{
196204
u16 phcon1 = encx24j600_read_phy(priv, PHCON1);
205+
197206
if (priv->autoneg == AUTONEG_ENABLE) {
198207
phcon1 |= ANEN | RENEG;
199208
} else {
@@ -328,6 +337,7 @@ static int encx24j600_receive_packet(struct encx24j600_priv *priv,
328337
{
329338
struct net_device *dev = priv->ndev;
330339
struct sk_buff *skb = netdev_alloc_skb(dev, rsv->len + NET_IP_ALIGN);
340+
331341
if (!skb) {
332342
pr_err_ratelimited("RX: OOM: packet dropped\n");
333343
dev->stats.rx_dropped++;
@@ -828,6 +838,7 @@ static void encx24j600_set_multicast_list(struct net_device *dev)
828838
static void encx24j600_hw_tx(struct encx24j600_priv *priv)
829839
{
830840
struct net_device *dev = priv->ndev;
841+
831842
netif_info(priv, tx_queued, dev, "TX Packet Len:%d\n",
832843
priv->tx_skb->len);
833844

@@ -895,7 +906,6 @@ static void encx24j600_tx_timeout(struct net_device *dev)
895906

896907
dev->stats.tx_errors++;
897908
netif_wake_queue(dev);
898-
return;
899909
}
900910

901911
static int encx24j600_get_regs_len(struct net_device *dev)
@@ -958,12 +968,14 @@ static int encx24j600_set_settings(struct net_device *dev,
958968
static u32 encx24j600_get_msglevel(struct net_device *dev)
959969
{
960970
struct encx24j600_priv *priv = netdev_priv(dev);
971+
961972
return priv->msg_enable;
962973
}
963974

964975
static void encx24j600_set_msglevel(struct net_device *dev, u32 val)
965976
{
966977
struct encx24j600_priv *priv = netdev_priv(dev);
978+
967979
priv->msg_enable = val;
968980
}
969981

0 commit comments

Comments
 (0)