Skip to content

Commit 8c5f9a8

Browse files
davem330davem330
committed
Merge branch 'ieee802154-for-davem-2017-11-09' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next
Stefan Schmidt says: ==================== pull-request: net-next: ieee802154 2017-11-09 A small update on ieee802154 patches for net-next. Nothing dramatic, but simply housekeeping this time around. A fix for the correct mask to be applied in the mrf24j40 driver by Gustavo A. R. Silva Removal of a non existing email user for the ca8210 driver by Harry Morris A bunch of checkpatch cleanups across the subsystem from myself ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 3ec26c7 + 7558bd5 commit 8c5f9a8

File tree

6 files changed

+63
-66
lines changed

6 files changed

+63
-66
lines changed

‎MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3084,7 +3084,6 @@ F: arch/c6x/
30843084

30853085
CA8210 IEEE-802.15.4 RADIO DRIVER
30863086
M: Harry Morris <h.morris@cascoda.com>
3087-
M: linuxdev@cascoda.com
30883087
L: linux-wpan@vger.kernel.org
30893088
W: https://github.com/Cascoda/ca8210-linux.git
30903089
S: Maintained

‎drivers/net/ieee802154/adf7242.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ static int adf7242_status(struct adf7242_local *lp, u8 *stat)
311311
return status;
312312
}
313313

314-
static int adf7242_wait_status(struct adf7242_local *lp, unsigned status,
315-
unsigned mask, int line)
314+
static int adf7242_wait_status(struct adf7242_local *lp, unsigned int status,
315+
unsigned int mask, int line)
316316
{
317317
int cnt = 0, ret = 0;
318318
u8 stat;
@@ -477,7 +477,7 @@ static int adf7242_write_reg(struct adf7242_local *lp, u16 addr, u8 data)
477477
return status;
478478
}
479479

480-
static int adf7242_cmd(struct adf7242_local *lp, unsigned cmd)
480+
static int adf7242_cmd(struct adf7242_local *lp, unsigned int cmd)
481481
{
482482
int status;
483483

@@ -920,7 +920,7 @@ static void adf7242_debug(u8 irq1)
920920
static irqreturn_t adf7242_isr(int irq, void *data)
921921
{
922922
struct adf7242_local *lp = data;
923-
unsigned xmit;
923+
unsigned int xmit;
924924
u8 irq1;
925925

926926
adf7242_wait_status(lp, RC_STATUS_PHY_RDY, RC_STATUS_MASK, __LINE__);

‎drivers/net/ieee802154/atusb.c

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ struct atusb {
6161
struct usb_ctrlrequest tx_dr;
6262
struct urb *tx_urb;
6363
struct sk_buff *tx_skb;
64-
uint8_t tx_ack_seq; /* current TX ACK sequence number */
64+
u8 tx_ack_seq; /* current TX ACK sequence number */
6565

6666
/* Firmware variable */
6767
unsigned char fw_ver_maj; /* Firmware major version number */
@@ -99,44 +99,43 @@ static int atusb_control_msg(struct atusb *atusb, unsigned int pipe,
9999
if (ret < 0) {
100100
atusb->err = ret;
101101
dev_err(&usb_dev->dev,
102-
"atusb_control_msg: req 0x%02x val 0x%x idx 0x%x, error %d\n",
103-
request, value, index, ret);
102+
"%s: req 0x%02x val 0x%x idx 0x%x, error %d\n",
103+
__func__, request, value, index, ret);
104104
}
105105
return ret;
106106
}
107107

108-
static int atusb_command(struct atusb *atusb, uint8_t cmd, uint8_t arg)
108+
static int atusb_command(struct atusb *atusb, u8 cmd, u8 arg)
109109
{
110110
struct usb_device *usb_dev = atusb->usb_dev;
111111

112-
dev_dbg(&usb_dev->dev, "atusb_command: cmd = 0x%x\n", cmd);
112+
dev_dbg(&usb_dev->dev, "%s: cmd = 0x%x\n", __func__, cmd);
113113
return atusb_control_msg(atusb, usb_sndctrlpipe(usb_dev, 0),
114114
cmd, ATUSB_REQ_TO_DEV, arg, 0, NULL, 0, 1000);
115115
}
116116

117-
static int atusb_write_reg(struct atusb *atusb, uint8_t reg, uint8_t value)
117+
static int atusb_write_reg(struct atusb *atusb, u8 reg, u8 value)
118118
{
119119
struct usb_device *usb_dev = atusb->usb_dev;
120120

121-
dev_dbg(&usb_dev->dev, "atusb_write_reg: 0x%02x <- 0x%02x\n",
122-
reg, value);
121+
dev_dbg(&usb_dev->dev, "%s: 0x%02x <- 0x%02x\n", __func__, reg, value);
123122
return atusb_control_msg(atusb, usb_sndctrlpipe(usb_dev, 0),
124123
ATUSB_REG_WRITE, ATUSB_REQ_TO_DEV,
125124
value, reg, NULL, 0, 1000);
126125
}
127126

128-
static int atusb_read_reg(struct atusb *atusb, uint8_t reg)
127+
static int atusb_read_reg(struct atusb *atusb, u8 reg)
129128
{
130129
struct usb_device *usb_dev = atusb->usb_dev;
131130
int ret;
132-
uint8_t *buffer;
133-
uint8_t value;
131+
u8 *buffer;
132+
u8 value;
134133

135134
buffer = kmalloc(1, GFP_KERNEL);
136135
if (!buffer)
137136
return -ENOMEM;
138137

139-
dev_dbg(&usb_dev->dev, "atusb: reg = 0x%x\n", reg);
138+
dev_dbg(&usb_dev->dev, "%s: reg = 0x%x\n", __func__, reg);
140139
ret = atusb_control_msg(atusb, usb_rcvctrlpipe(usb_dev, 0),
141140
ATUSB_REG_READ, ATUSB_REQ_FROM_DEV,
142141
0, reg, buffer, 1, 1000);
@@ -151,15 +150,14 @@ static int atusb_read_reg(struct atusb *atusb, uint8_t reg)
151150
}
152151
}
153152

154-
static int atusb_write_subreg(struct atusb *atusb, uint8_t reg, uint8_t mask,
155-
uint8_t shift, uint8_t value)
153+
static int atusb_write_subreg(struct atusb *atusb, u8 reg, u8 mask,
154+
u8 shift, u8 value)
156155
{
157156
struct usb_device *usb_dev = atusb->usb_dev;
158-
uint8_t orig, tmp;
157+
u8 orig, tmp;
159158
int ret = 0;
160159

161-
dev_dbg(&usb_dev->dev, "atusb_write_subreg: 0x%02x <- 0x%02x\n",
162-
reg, value);
160+
dev_dbg(&usb_dev->dev, "%s: 0x%02x <- 0x%02x\n", __func__, reg, value);
163161

164162
orig = atusb_read_reg(atusb, reg);
165163

@@ -261,12 +259,12 @@ static void atusb_work_urbs(struct work_struct *work)
261259

262260
/* ----- Asynchronous USB -------------------------------------------------- */
263261

264-
static void atusb_tx_done(struct atusb *atusb, uint8_t seq)
262+
static void atusb_tx_done(struct atusb *atusb, u8 seq)
265263
{
266264
struct usb_device *usb_dev = atusb->usb_dev;
267-
uint8_t expect = atusb->tx_ack_seq;
265+
u8 expect = atusb->tx_ack_seq;
268266

269-
dev_dbg(&usb_dev->dev, "atusb_tx_done (0x%02x/0x%02x)\n", seq, expect);
267+
dev_dbg(&usb_dev->dev, "%s (0x%02x/0x%02x)\n", __func__, seq, expect);
270268
if (seq == expect) {
271269
/* TODO check for ifs handling in firmware */
272270
ieee802154_xmit_complete(atusb->hw, atusb->tx_skb, false);
@@ -287,7 +285,7 @@ static void atusb_in_good(struct urb *urb)
287285
struct usb_device *usb_dev = urb->dev;
288286
struct sk_buff *skb = urb->context;
289287
struct atusb *atusb = SKB_ATUSB(skb);
290-
uint8_t len, lqi;
288+
u8 len, lqi;
291289

292290
if (!urb->actual_length) {
293291
dev_dbg(&usb_dev->dev, "atusb_in: zero-sized URB ?\n");
@@ -326,15 +324,15 @@ static void atusb_in(struct urb *urb)
326324
struct sk_buff *skb = urb->context;
327325
struct atusb *atusb = SKB_ATUSB(skb);
328326

329-
dev_dbg(&usb_dev->dev, "atusb_in: status %d len %d\n",
327+
dev_dbg(&usb_dev->dev, "%s: status %d len %d\n", __func__,
330328
urb->status, urb->actual_length);
331329
if (urb->status) {
332330
if (urb->status == -ENOENT) { /* being killed */
333331
kfree_skb(skb);
334332
urb->context = NULL;
335333
return;
336334
}
337-
dev_dbg(&usb_dev->dev, "atusb_in: URB error %d\n", urb->status);
335+
dev_dbg(&usb_dev->dev, "%s: URB error %d\n", __func__, urb->status);
338336
} else {
339337
atusb_in_good(urb);
340338
}
@@ -388,7 +386,7 @@ static int atusb_xmit(struct ieee802154_hw *hw, struct sk_buff *skb)
388386
struct usb_device *usb_dev = atusb->usb_dev;
389387
int ret;
390388

391-
dev_dbg(&usb_dev->dev, "atusb_xmit (%d)\n", skb->len);
389+
dev_dbg(&usb_dev->dev, "%s (%d)\n", __func__, skb->len);
392390
atusb->tx_skb = skb;
393391
atusb->tx_ack_seq++;
394392
atusb->tx_dr.wIndex = cpu_to_le16(atusb->tx_ack_seq);
@@ -399,13 +397,13 @@ static int atusb_xmit(struct ieee802154_hw *hw, struct sk_buff *skb)
399397
(unsigned char *)&atusb->tx_dr, skb->data,
400398
skb->len, atusb_xmit_complete, NULL);
401399
ret = usb_submit_urb(atusb->tx_urb, GFP_ATOMIC);
402-
dev_dbg(&usb_dev->dev, "atusb_xmit done (%d)\n", ret);
400+
dev_dbg(&usb_dev->dev, "%s done (%d)\n", __func__, ret);
403401
return ret;
404402
}
405403

406404
static int atusb_ed(struct ieee802154_hw *hw, u8 *level)
407405
{
408-
BUG_ON(!level);
406+
WARN_ON(!level);
409407
*level = 0xbe;
410408
return 0;
411409
}
@@ -420,15 +418,15 @@ static int atusb_set_hw_addr_filt(struct ieee802154_hw *hw,
420418
if (changed & IEEE802154_AFILT_SADDR_CHANGED) {
421419
u16 addr = le16_to_cpu(filt->short_addr);
422420

423-
dev_vdbg(dev, "atusb_set_hw_addr_filt called for saddr\n");
421+
dev_vdbg(dev, "%s called for saddr\n", __func__);
424422
atusb_write_reg(atusb, RG_SHORT_ADDR_0, addr);
425423
atusb_write_reg(atusb, RG_SHORT_ADDR_1, addr >> 8);
426424
}
427425

428426
if (changed & IEEE802154_AFILT_PANID_CHANGED) {
429427
u16 pan = le16_to_cpu(filt->pan_id);
430428

431-
dev_vdbg(dev, "atusb_set_hw_addr_filt called for pan id\n");
429+
dev_vdbg(dev, "%s called for pan id\n", __func__);
432430
atusb_write_reg(atusb, RG_PAN_ID_0, pan);
433431
atusb_write_reg(atusb, RG_PAN_ID_1, pan >> 8);
434432
}
@@ -437,14 +435,13 @@ static int atusb_set_hw_addr_filt(struct ieee802154_hw *hw,
437435
u8 i, addr[IEEE802154_EXTENDED_ADDR_LEN];
438436

439437
memcpy(addr, &filt->ieee_addr, IEEE802154_EXTENDED_ADDR_LEN);
440-
dev_vdbg(dev, "atusb_set_hw_addr_filt called for IEEE addr\n");
438+
dev_vdbg(dev, "%s called for IEEE addr\n", __func__);
441439
for (i = 0; i < 8; i++)
442440
atusb_write_reg(atusb, RG_IEEE_ADDR_0 + i, addr[i]);
443441
}
444442

445443
if (changed & IEEE802154_AFILT_PANC_CHANGED) {
446-
dev_vdbg(dev,
447-
"atusb_set_hw_addr_filt called for panc change\n");
444+
dev_vdbg(dev, "%s called for panc change\n", __func__);
448445
if (filt->pan_coord)
449446
atusb_write_subreg(atusb, SR_AACK_I_AM_COORD, 1);
450447
else
@@ -460,7 +457,7 @@ static int atusb_start(struct ieee802154_hw *hw)
460457
struct usb_device *usb_dev = atusb->usb_dev;
461458
int ret;
462459

463-
dev_dbg(&usb_dev->dev, "atusb_start\n");
460+
dev_dbg(&usb_dev->dev, "%s\n", __func__);
464461
schedule_delayed_work(&atusb->work, 0);
465462
atusb_command(atusb, ATUSB_RX_MODE, 1);
466463
ret = atusb_get_and_clear_error(atusb);
@@ -474,7 +471,7 @@ static void atusb_stop(struct ieee802154_hw *hw)
474471
struct atusb *atusb = hw->priv;
475472
struct usb_device *usb_dev = atusb->usb_dev;
476473

477-
dev_dbg(&usb_dev->dev, "atusb_stop\n");
474+
dev_dbg(&usb_dev->dev, "%s\n", __func__);
478475
usb_kill_anchored_urbs(&atusb->idle_urbs);
479476
atusb_command(atusb, ATUSB_RX_MODE, 0);
480477
atusb_get_and_clear_error(atusb);
@@ -842,7 +839,8 @@ static int atusb_get_and_show_revision(struct atusb *atusb)
842839

843840
dev_info(&usb_dev->dev,
844841
"Firmware: major: %u, minor: %u, hardware type: %s (%d)\n",
845-
atusb->fw_ver_maj, atusb->fw_ver_min, hw_name, atusb->fw_hw_type);
842+
atusb->fw_ver_maj, atusb->fw_ver_min, hw_name,
843+
atusb->fw_hw_type);
846844
}
847845
if (atusb->fw_ver_maj == 0 && atusb->fw_ver_min < 2) {
848846
dev_info(&usb_dev->dev,
@@ -880,7 +878,7 @@ static int atusb_get_and_show_build(struct atusb *atusb)
880878
static int atusb_get_and_conf_chip(struct atusb *atusb)
881879
{
882880
struct usb_device *usb_dev = atusb->usb_dev;
883-
uint8_t man_id_0, man_id_1, part_num, version_num;
881+
u8 man_id_0, man_id_1, part_num, version_num;
884882
const char *chip;
885883
struct ieee802154_hw *hw = atusb->hw;
886884

@@ -977,7 +975,8 @@ static int atusb_set_extended_addr(struct atusb *atusb)
977975
int ret;
978976

979977
/* Firmware versions before 0.3 do not support the EUI64_READ command.
980-
* Just use a random address and be done */
978+
* Just use a random address and be done.
979+
*/
981980
if (atusb->fw_ver_maj == 0 && atusb->fw_ver_min < 3) {
982981
ieee802154_random_extended_addr(&atusb->hw->phy->perm_extended_addr);
983982
return 0;
@@ -1007,7 +1006,7 @@ static int atusb_set_extended_addr(struct atusb *atusb)
10071006
atusb->hw->phy->perm_extended_addr = extended_addr;
10081007
addr = swab64((__force u64)atusb->hw->phy->perm_extended_addr);
10091008
dev_info(&usb_dev->dev, "Read permanent extended address %8phC from device\n",
1010-
&addr);
1009+
&addr);
10111010
}
10121011

10131012
kfree(buffer);
@@ -1129,7 +1128,7 @@ static void atusb_disconnect(struct usb_interface *interface)
11291128
{
11301129
struct atusb *atusb = usb_get_intfdata(interface);
11311130

1132-
dev_dbg(&atusb->usb_dev->dev, "atusb_disconnect\n");
1131+
dev_dbg(&atusb->usb_dev->dev, "%s\n", __func__);
11331132

11341133
atusb->shutdown = 1;
11351134
cancel_delayed_work_sync(&atusb->work);
@@ -1146,7 +1145,7 @@ static void atusb_disconnect(struct usb_interface *interface)
11461145
usb_set_intfdata(interface, NULL);
11471146
usb_put_dev(atusb->usb_dev);
11481147

1149-
pr_debug("atusb_disconnect done\n");
1148+
pr_debug("%s done\n", __func__);
11501149
}
11511150

11521151
/* The devices we work with */

‎drivers/net/ieee802154/ca8210.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ static int ca8210_spi_transfer(
924924
priv = spi_get_drvdata(spi);
925925
reinit_completion(&priv->spi_transfer_complete);
926926

927-
dev_dbg(&spi->dev, "ca8210_spi_transfer called\n");
927+
dev_dbg(&spi->dev, "%s called\n", __func__);
928928

929929
cas_ctl = kmalloc(sizeof(*cas_ctl), GFP_ATOMIC);
930930
if (!cas_ctl)
@@ -1303,7 +1303,7 @@ static u8 tdme_checkpibattribute(
13031303
break;
13041304
/* MAC */
13051305
case MAC_BATT_LIFE_EXT_PERIODS:
1306-
if ((value < 6) || (value > 41))
1306+
if (value < 6 || value > 41)
13071307
status = MAC_INVALID_PARAMETER;
13081308
break;
13091309
case MAC_BEACON_PAYLOAD:
@@ -1319,7 +1319,7 @@ static u8 tdme_checkpibattribute(
13191319
status = MAC_INVALID_PARAMETER;
13201320
break;
13211321
case MAC_MAX_BE:
1322-
if ((value < 3) || (value > 8))
1322+
if (value < 3 || value > 8)
13231323
status = MAC_INVALID_PARAMETER;
13241324
break;
13251325
case MAC_MAX_CSMA_BACKOFFS:
@@ -1335,7 +1335,7 @@ static u8 tdme_checkpibattribute(
13351335
status = MAC_INVALID_PARAMETER;
13361336
break;
13371337
case MAC_RESPONSE_WAIT_TIME:
1338-
if ((value < 2) || (value > 64))
1338+
if (value < 2 || value > 64)
13391339
status = MAC_INVALID_PARAMETER;
13401340
break;
13411341
case MAC_SUPERFRAME_ORDER:
@@ -1511,7 +1511,7 @@ static u8 mcps_data_request(
15111511
psec = (struct secspec *)(command.pdata.data_req.msdu + msdu_length);
15121512
command.length = sizeof(struct mcps_data_request_pset) -
15131513
MAX_DATA_SIZE + msdu_length;
1514-
if (!security || (security->security_level == 0)) {
1514+
if (!security || security->security_level == 0) {
15151515
psec->security_level = 0;
15161516
command.length += 1;
15171517
} else {
@@ -1561,7 +1561,7 @@ static u8 mlme_reset_request_sync(
15611561
status = response.pdata.status;
15621562

15631563
/* reset COORD Bit for Channel Filtering as Coordinator */
1564-
if (CA8210_MAC_WORKAROUNDS && set_default_pib && (!status)) {
1564+
if (CA8210_MAC_WORKAROUNDS && set_default_pib && !status) {
15651565
status = tdme_setsfr_request_sync(
15661566
0,
15671567
CA8210_SFR_MACCON,
@@ -1898,7 +1898,7 @@ static int ca8210_net_rx(struct ieee802154_hw *hw, u8 *command, size_t len)
18981898
unsigned long flags;
18991899
u8 status;
19001900

1901-
dev_dbg(&priv->spi->dev, "ca8210_net_rx(), CmdID = %d\n", command[0]);
1901+
dev_dbg(&priv->spi->dev, "%s: CmdID = %d\n", __func__, command[0]);
19021902

19031903
if (command[0] == SPI_MCPS_DATA_INDICATION) {
19041904
/* Received data */
@@ -1948,7 +1948,7 @@ static int ca8210_skb_tx(
19481948
struct secspec secspec;
19491949
unsigned int mac_len;
19501950

1951-
dev_dbg(&priv->spi->dev, "ca8210_skb_tx() called\n");
1951+
dev_dbg(&priv->spi->dev, "%s called\n", __func__);
19521952

19531953
/* Get addressing info from skb - ieee802154 layer creates a full
19541954
* packet
@@ -2051,7 +2051,7 @@ static int ca8210_xmit_async(struct ieee802154_hw *hw, struct sk_buff *skb)
20512051
struct ca8210_priv *priv = hw->priv;
20522052
int status;
20532053

2054-
dev_dbg(&priv->spi->dev, "calling ca8210_xmit_async()\n");
2054+
dev_dbg(&priv->spi->dev, "calling %s\n", __func__);
20552055

20562056
priv->tx_skb = skb;
20572057
priv->async_tx_pending = true;
@@ -2369,7 +2369,7 @@ static int ca8210_set_promiscuous_mode(struct ieee802154_hw *hw, const bool on)
23692369
MAC_PROMISCUOUS_MODE,
23702370
0,
23712371
1,
2372-
(const void*)&on,
2372+
(const void *)&on,
23732373
priv->spi
23742374
);
23752375
if (status) {

0 commit comments

Comments
 (0)