Skip to contentSkip to conversation

cleanup for mrf24j40

PATCH In review Varka Bhadram 3 participants 6 messages Sep 19, 2014 – Sep 24, 2014

Subsystems (3)
Network drivers IEEE 802.15.4 MRF24J40 IEEE 802.15.4 radio driver
lore
Share & tools
lore

Varka Bhadram

author
#0 lore raw

v3 cover cleanup for mrf24j40

changes since v2:
- generated patches based on wpan-next

changes since v1:
- changes in commit messages and descriptions suggested by Alan Ott

Varka Bhadram (3):
mrf24j40: fix Missing a blank line after declarations
mrf24j40: remove unnecessary return statement
mrf24j40: use pr_* / dev_* instead of printk()

 drivers/net/ieee802154/mrf24j40.c |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH v3 1/3 mrf24j40: fix Missing a blank line after declarations

Signed-off-by Varka Bhadram <[email protected]>
---
 drivers/net/ieee802154/mrf24j40.c |    3 +++
 1 file changed, 3 insertions(+)
drivers/net/ieee802154/mrf24j40.c +3 -0
index 9e6a124..466da57 100644
@@ -412,6 +412,7 @@ static void mrf24j40_stop(struct ieee802154_dev *dev)
 	struct mrf24j40 *devrec = dev->priv;
 	u8 val;
 	int ret;
+
 	dev_dbg(printdev(devrec), "stop\n");
 
 	ret = read_short_reg(devrec, REG_INTCON, &val);

@@ -465,6 +466,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev,
 	if (changed & IEEE802515_AFILT_SADDR_CHANGED) {
 		/* Short Addr */
 		u8 addrh, addrl;
+
 		addrh = le16_to_cpu(filt->short_addr) >> 8 & 0xff;
 		addrl = le16_to_cpu(filt->short_addr) & 0xff;
 

@@ -493,6 +495,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev,
 	if (changed & IEEE802515_AFILT_PANID_CHANGED) {
 		/* PAN ID */
 		u8 panidl, panidh;
+
 		panidh = le16_to_cpu(filt->pan_id) >> 8 & 0xff;
 		panidl = le16_to_cpu(filt->pan_id) & 0xff;
 		write_short_reg(devrec, REG_PANIDH, panidh);
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH v3 2/3 mrf24j40: remove unnecessary return statement

In reply to Varka Bhadram

Remove the return statement in the void function.

Signed-off-by Varka Bhadram <[email protected]>
---
 drivers/net/ieee802154/mrf24j40.c |    2 --
 1 file changed, 2 deletions(-)
drivers/net/ieee802154/mrf24j40.c +0 -2
index 466da57..2c617e3 100644
@@ -420,8 +420,6 @@ static void mrf24j40_stop(struct ieee802154_dev *dev)
 		return;
 	val |= 0x1|0x8; /* Set TXNIE and RXIE. Disable Interrupts */
 	write_short_reg(devrec, REG_INTCON, val);
-
-	return;
 }
 
 static int mrf24j40_set_channel(struct ieee802154_dev *dev,
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH v3 3/3 mrf24j40: use pr_* / dev_* instead of printk()

In reply to Varka Bhadram

Replace printk() with dev_*() pr_*().

Signed-off-by Varka Bhadram <[email protected]>
---
 drivers/net/ieee802154/mrf24j40.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ieee802154/mrf24j40.c +7 -7
index 2c617e3..07e0b88 100644
@@ -323,8 +323,8 @@ static int mrf24j40_read_rx_buf(struct mrf24j40 *devrec,
 #ifdef DEBUG
 	print_hex_dump(KERN_DEBUG, "mrf24j40 rx: ",
 		DUMP_PREFIX_OFFSET, 16, 1, data, *len, 0);
-	printk(KERN_DEBUG "mrf24j40 rx: lqi: %02hhx rssi: %02hhx\n",
-		lqi_rssi[0], lqi_rssi[1]);
+	pr_debug("mrf24j40 rx: lqi: %02hhx rssi: %02hhx\n",
+		 lqi_rssi[0], lqi_rssi[1]);
 #endif
 
 out:

@@ -385,7 +385,7 @@ err:
 static int mrf24j40_ed(struct ieee802154_dev *dev, u8 *level)
 {
 	/* TODO: */
-	printk(KERN_WARNING "mrf24j40: ed not implemented\n");
+	pr_warn("mrf24j40: ed not implemented\n");
 	*level = 0;
 	return 0;
 }

@@ -483,10 +483,10 @@ static int mrf24j40_filter(struct ieee802154_dev *dev,
 			write_short_reg(devrec, REG_EADR0 + i, addr[i]);
 
 #ifdef DEBUG
-		printk(KERN_DEBUG "Set long addr to: ");
+		pr_debug("Set long addr to: ");
 		for (i = 0; i < 8; i++)
-			printk("%02hhx ", addr[7 - i]);
-		printk(KERN_DEBUG "\n");
+			pr_debug("%02hhx ", addr[7 - i]);
+		pr_debug("\n");
 #endif
 	}
 

@@ -702,7 +702,7 @@ static int mrf24j40_probe(struct spi_device *spi)
 	int ret = -ENOMEM;
 	struct mrf24j40 *devrec;
 
-	printk(KERN_INFO "mrf24j40: probe(). IRQ: %d\n", spi->irq);
+	dev_info(&spi->dev, "probe(). IRQ: %d\n", spi->irq);
 
 	devrec = devm_kzalloc(&spi->dev, sizeof(struct mrf24j40), GFP_KERNEL);
 	if (!devrec)
Signature · 1 line
1.7.9.5
Acked-by on the v3 series
#4 lore raw
In reply to Varka Bhadram
Quoted 6 lines · Varka Bhadram

changes since v2:
- generated patches based on wpan-next

changes since v1:
- changes in commit messages and descriptions suggested by Alan Ott

Quoted 8 lines

Varka Bhadram (3):
mrf24j40: fix Missing a blank line after declarations
mrf24j40: remove unnecessary return statement
mrf24j40: use pr_* / dev_* instead of printk()

  drivers/net/ieee802154/mrf24j40.c |   19 ++++++++++---------
  1 file changed, 10 insertions(+), 9 deletions(-)
Acked-by Alan Ott <[email protected]>

Thanks.

maintainer
#5 lore raw
Quoted 12 lines · Alan Ott
Quoted 11 lines · Varka Bhadram

changes since v2:
- generated patches based on wpan-next

changes since v1:
- changes in commit messages and descriptions suggested by Alan Ott

Varka Bhadram (3):
mrf24j40: fix Missing a blank line after declarations
mrf24j40: remove unnecessary return statement
mrf24j40: use pr_* / dev_* instead of printk()

Quoted 6 lines
Quoted 3 lines
 drivers/net/ieee802154/mrf24j40.c |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
Acked-by Alan Ott <[email protected]>

Patches applied to wpan-next/testing branch. Note I catch all patches to the testing branch and when these are applied to bluetooth then I rebase the master branch again to the bluetooth master branch.

After that you have these patches are inside of wpan-next master branch.

- Alex